Bug: 328173922
Test: atest AudioMixTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a96eaff73ba3ed3c83a79ee9c4df4af76a74508d)
Merged-In: Ifba8672a61e7ee456365bfce66379e2de5031f43
Change-Id: Ifba8672a61e7ee456365bfce66379e2de5031f43

With different user the activity will be blocked which results in
infinite recursive loop.

Bug: 328298904
Test: Manually reproduced bug with Exo and tested the bugfix
Test: atest ActivityBlockingTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f44a53f962abc8af48d875c85da8a69eb3dfa23c)
Merged-In: I36761e7104418d41d22f97f82cef336833709060
Change-Id: I36761e7104418d41d22f97f82cef336833709060

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26445688', 'googleplex-android-review.googlesource.com/26418741', 'googleplex-android-review.googlesource.com/26462677', 'googleplex-android-review.googlesource.com/26463033', 'googleplex-android-review.googlesource.com/26458856', 'googleplex-android-review.googlesource.com/26460038'] into 24Q2-release.

Change-Id: I463972265fc3f4040e5b05d3252373440f2c3a40

This reintroduces an InputMethodInfo constructor that is required for
CTS. In [1] it was modified to include an additonal String, but the
original signature is still required.

  [1]: I18e7c5dc5271bee44e4540b3070b989df4e27c4c

Bug: 325708986
Test: atest InputMethodInfoTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2fdc875f2df390f2fbdec5847de64caded33f62c)
Merged-In: Iaa5a365f20146f9a3b640a10d3b3f357de322521
Change-Id: Iaa5a365f20146f9a3b640a10d3b3f357de322521

Add the fixed keyboard amplitude check to ensure
we only depend on keyboard vibration settings for
supported devices.

Bug: 326027376
Test: atest VibrationSettingsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:761251b91bae3ca462111e26b3f9a0a34146d71d)
Merged-In: I2c6f6272abe7d39f02647456e3adfffd00bac660
Change-Id: I2c6f6272abe7d39f02647456e3adfffd00bac660

This is to fix the regression introduced by ag/26340832. When apps like
YT provide empty aspect ratio via PictureInPictureParams, the zero value
would be used to calculate the min / max allowed size and causes the PiP
window to be resized unexpectedly.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/frCUwuTnpvVPMqFs3C5Gnk
Bug: 328051931
Test: manual, follow the reproduce steps, see video
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:63c0f02a731151d7b5ec6ea3a1a1466f0774cc32)
Merged-In: Icab07e634cbd3c19668640203b586f10219c0410
Change-Id: Icab07e634cbd3c19668640203b586f10219c0410

This reverts commit 8f235fdb.

Reason for revert: Droid-monitored triggered revert due to b/323012112. Will be verifying through ABTD for confirmation and before submitting the revert.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb12c4025e0590c6eba14c1157a1390738d4d697)
Merged-In: I616b3889eb5d53a05602c06fb2d6514f0f14d4d1
Change-Id: I616b3889eb5d53a05602c06fb2d6514f0f14d4d1

This reverts commit 50aaabe4.

Reason for revert: Comment #18 on b/315576239 confirms the forward fix mitigated the original regression; hence this revert was unnecessary and should be undone to prevent the original issue b/267465887 from regressing.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b4d4604a9b618d20971787196d8839fef9b32d0c)
Merged-In: If9e0aebba47a7778a7f6a7c32c83fedb281d9603
Change-Id: If9e0aebba47a7778a7f6a7c32c83fedb281d9603

This reverts commit bb5fbe45.

Reason for revert: b/327379172
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:44161444381ee22d91e6f807782ecf2f9c25324c)
Merged-In: Iaf387c2bdc70bfd9e125445849c45550039874c1
Change-Id: Iaf387c2bdc70bfd9e125445849c45550039874c1

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26451584', 'googleplex-android-review.googlesource.com/26450617', 'googleplex-android-review.googlesource.com/26456599'] into 24Q2-release.

Change-Id: Idbd17d8b2dd1147cc2634ff36917441ba20287b7

This change ensures that the deferred reordering action always runs at the end of the gesture.

We started deferring reordering actions to avoid breaking drag gestures. But tapping on the selected bubble to collapse the stack is considered a gesture as well.
Previously the reorder action did not get run in that case, because the specific touch listener that runs it ignores touch events during animations.

Fixes: 323310200
Test: Manual
      - Create 2 bubbles
      - Expand stack
      - Tap on second bubble
      - Tap on the second bubble again to collapse the stack
      - Observe that the second bubble is showing in the collapsed state
Test: Manual -- also checked that dragging isn't broken when a new bubble is added
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1487b7cb2c86271ff2d190ab69e7907232981284)
Merged-In: I4bfcff7e23e7ee3f4304a28cac4a9ba6e10cee16
Change-Id: I4bfcff7e23e7ee3f4304a28cac4a9ba6e10cee16

This reverts commit 4a9ad356.

Reason for revert: investigating test failures
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c367000aec452ad44e5c3eec2fd276f0862e303c)
Merged-In: I09d0f919557433ec4f56ab0a8ad2da1d3d2dccf6
Change-Id: I09d0f919557433ec4f56ab0a8ad2da1d3d2dccf6

This reverts commit cc465c76.

Reason for revert: b/328017336
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e3c48ee904c1f0d6f92b185310774a02788d28d)
Merged-In: Ic93a80db0a805bb13ad9a7ca507eaa43e7e7211b
Change-Id: Ic93a80db0a805bb13ad9a7ca507eaa43e7e7211b

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26445668', 'googleplex-android-review.googlesource.com/26443767'] into 24Q2-release.

Change-Id: Id354e60f4c1b6433b88a88aa0d4d47671a32e087

This reverts commit c13e9b33.

Reason for revert: causing half black screen b/327965719

Bug: 327965719
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9ec8f8ef9c505919e7d9e0e0f2d928d196bd82d2)
Merged-In: I012dea91225254f1ac17208fa134595e5bfd2bcb
Change-Id: I012dea91225254f1ac17208fa134595e5bfd2bcb

Revert submission 26188732-satellite_internet_support

Reason for revert: Droid-monitored triggered revert due to b/328107058. Will be verifying through ABTD for confirmation and before submitting the revert.

Reverted changes: /q/submissionid:26188732-satellite_internet_support
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:66223039bc89f2600508066af4f8ba89dc21933a)
Merged-In: Ie27eb2149aaabff97cf72a032265523a807a82fd
Change-Id: Ie27eb2149aaabff97cf72a032265523a807a82fd

Change-Id: I5c44220de2a44643b63f66ff48ce62e2e61608b0

Merge "Revert "Enforce voice activation permission check on VoiceInteractionManagerService API."" into main

This can happen after boot, or if the auth is locked out.

Fixes: 327718578
Test: atest KeyguardTransitionScenariosTest
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
TEAMFOOD

Change-Id: Ie71e752f0224aa239ba1350d50996ce4b510949a

Merge "Add configuration for network capabilities that would be forced marked as cellular transport " into main

Merge "Adding method to update processing state of isolated process via the non-isolated counterpart. It creates a proxy to invoke the updateProcessingState method via system-server callback." into main

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



Change-Id: I3ab671cf0be3efd855c6cdcb17067f7fedbd7375
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/+/2957052



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

Merge "Extract isShowingOnLockscreen from NotificationListViewModel to NotificationStackInteractor" into main

Change-Id: I6ff04ec54eab7789bf46a360e8d587ff51ef6d62

Bug: 307645200
Test: see screenshots attached to bug
Change-Id: I20448ffd7cccf96418b57623a34491638de72778