It's not bromine, it's not a gauge of film: it's the next Android
release.

Bug: 335304236
Test: presubmit
Change-Id: I20b47bf5c4d922f2e2061bd1ef0606fb5a7f7efb

* changes:
  Fix cancelScanRequest() scanning state update logic
  Make manager scans populate active scanning packages

Before this change, the method would not turn off scanning in
system_server when a screen-on scan request was released. As a result,
proxy routers would unknowingly keep scanning forever even after having cancelled
their scan requests.

Bug: 331202666
Test: atest MediaRouter2HostSideTest ProxyMediaRouter2HostSideTest
Change-Id: I63563f38b7d53e608782e651150242519a55f5ce
Flag: com.android.media.flags.enable_screen_off_scanning

Without populating actively scanning packages in the composite discovery
preference, self-scan route providers will not bind to system_server
when proxy routers start scanning on behalf of the self-scan provider's
router.

This change also fixes logic error in MediaRoute2ProviderServiceProxy's
binding logic.

Test: atest ProxyMediaRouter2HostSideTest MediaRouter2HostSideTest
Bug: 319604673
Change-Id: Ia079eae911f9700ef2a838d97dc7c0a24bbf6946
Flag: com.android.media.flags.enable_prevention_of_manager_scans_when_no_apps_scan

Bug: 335456104
Test: Local build / launch; CTS test in ag/27000735
Flag: android.server.remove_text_service
Change-Id: Ib7f56d663852dfcc22b8f97aed85135228235e59

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27006581



Change-Id: Ifdf018942a807101cba8156cb852d5a56147c132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Integrating new Avatar Picker App in Settings" into main am: a5c94e61 am: eb3be7b2 -s ours

am skip reason: Merged-In I8905841cc46ba62099f44dbecf01c06869677bf5 with SHA-1 9d5f70c8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3051762



Change-Id: I9f87c275e35a18b112587d914520ea90e00c1954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Adding avatar picker to platform allow list" into main am: 487165c6 am: 8cb9033e -s ours

am skip reason: Merged-In I096d28bce5f879f88f185f09014d139f0497cb72 with SHA-1 f1d32bc1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3052022



Change-Id: Ibd8670429f24e0d144f3edf9c5d8a8668ab2bebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3051762



Change-Id: I64d5be9443441fd1eb337970a9a67bfa97cfb533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3052022



Change-Id: I080994875fba773a72a182ec0f9df389d85d1784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

In case the ime target is still on screen after swiping to home.
Such as a top floating window with a text input field.

Bug: 335204769
Test: Returns from landscape app to portrait home by gesture
      while an overlay floating window is the ime target. The ime
      should still be visible after returning to home.
Change-Id: Ib653b6160d4c4dac7dc17f1b8298a0c3e5f2252f

Merge "Revert^2 "Simplify MediaSessionRecord callback invocations"" into main am: bf62098c am: fcdb4f3a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3049905



Change-Id: I0950730507b4cd8d3536e5222e4bff1834147e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: b/319645714
Change-Id: I7bf8374786cf3290951fc208a9b6a581389ee6b7
Flag: DOCS_ONLY
Test: presubmit

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3049905



Change-Id: Ib668eb96baeafb3a7df8ffb0b6e65e9d3cc75795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

The previous changes to support specifying timestamps for evemu
recordings inadvertently made injections from JSON-style recordings have
the timestamps at which the injection was scheduled, not when it
happened, causing many events to be injected with very close-together
timestamps. This broke drawing in the tests for some inking libraries,
such as Keep's.

Bug: 330844071
Test: $ atest 'PlatformScenarioTests:android.platform.test.scenario.sysui.stylus.StylusInkingTest#writeText_appearsInShowcaseApp'
      (with the @Ignore in StylusInkingTest.kt removed)
Test: replay the recording from b/330844071#comment30, check the curve
      is drawn correctly
Test: replay an evemu recording and check that the timestamps shown by
      `getevent -lt` are still correct
Change-Id: I5342a79d4f9b53875b9918443bf1f5fd16cd205e

This reverts commit f4c7e72d.

Reason for revert: b/336222068

Change-Id: Ie16cbf6950ac400c0c386d5ddb0dc826c8e5c9d6

The source protos of the perfetto_trace_javastream target changed,
which results in slightly different classes to be imported.

Bug: 276433199
Test: presubmit
Change-Id: Ieb8022e76c6f9a8ae6081c96834e90b8f36f348c

This reverts commit f7290ab8.

Reason for revert: Potential culprit for b/336419424- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If926a344e6949be3dffd9983146ae35d3b4161cf

Because there can be multiple different UI threads for different
View windows, the corresponding configuration changed callback can be
triggered in different threads.

Add lock to make it thread-safe.

Fix: 335967960
Test: Refactor pass existing tests
Flag: com.android.window.flags.window_token_config_thread_safe
Change-Id: I504731bf60f029010ebd370bb2b2e99199998f2f

[automerger skipped] Merge "Stay registered to proximity sensor while activities are occluding keyguard" into 24D1-dev am: cf8362a5 -s ours

am skip reason: Merged-In I55f1472593d37f47574d4bf3c40ca7d69f86bad8 with SHA-1 9a29824c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27056015



Change-Id: I779a7c5e1e73a61fc30a98d201dd244da4f55ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>