- When splitting with an existing split pair task from an app icon
  menu we also need to avoid evicting the children to prevent the same
  race between start activity and eviction in ag/25565608

Fixes: 309905087
Test: Launch a split pair, Open a new fullscreen app, Use the taskbar
      to split with one of the previously paired tasks
Change-Id: I76808dfad48951d443593c6d3d284827ba7f2e00

Bug: 305856149
Test: manual - with Gallery
Test: unit test
Change-Id: Ie368a5a02078d01341a892ec810dc6cce57db1ee

Merge "Changing the visibility of getCarrierRestrictionStatus API to public with flagged annotation" into main

Test: manual, talkback announces direction to move
Test: atest PromptViewModelTest
Bug: 310044658
Flag: ACONFIG bp_talkback DEVELOPMENT
Change-Id: Ifd91dfad63189709cdb5881dd57f70a1723e002c

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



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

The NoteTask config mock does not behave as expected, so some tests were
giving false positives. So we use the actual config object rather than
a mock.

Test: NoteTaskQuickAffordanceConfigTest
Flag: N/A
Change-Id: I0fa757d8d66ce94d6bfad11932a975d60249ac15

As the build has cleared on the target that previously caused on the revert, should be safe to resubmit: https://android-build.corp.google.com/build_explorer/branch_dashboard/git_main-without-vendor/build_id/P66757989/?activeTarget=aosp_arm64-trunk_food-userdebug

Bug: 302596906
Test: mmm
Change-Id: If69cf64baf6359ad5a9c2ed1c6c7b3bee29a1f03

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



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

Cancels a device state request if the process
dies and the state has the FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP
flag.

Fixes: 306498716
Test: ExtensionRearDisplayPresentationTest#testStartAndEndRearDisplayPresentationSession_processDies
Test: OverrideRequestControllerTest

Change-Id: I8b5e9e1c95530de651b4315ddde54b5dd9db23a0

Test: NoteTaskQuickAffordanceConfigTest
Flag: N/A
Change-Id: I4439eccd47e93ed1c215e50e4674de95d2ddbd3e

Mark testNotificationEvent_quotaBump as flaky. am: 33cecbe1 am: aa245772 am: 366464dd am: 215b4e2a am: f8c8751f am: e1303991 am: 63ef8e13

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



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

Mark testNotificationEvent_quotaBump as flaky. am: 33cecbe1 am: 52a15269 am: 6b26a0d7 am: 7bb9c8ca am: d339f27a am: fbb2fbca

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



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

Removes SideFpsController and ISidefpsController from SystemUI and
system_server under sidefps_controller_refactor flag. This refactor
creates a new AuthenticationStateListener AIDL interface to communicate
authentication state updates from system_server to SystemUI - the
details of this refactor can be found at
go/sfps-controller-diagram-refactor

Flag: ACONFIG com.android.systemui.shared.sidefps_controller_refactor DEVELOPMENT
Bug: 288175061
Test: atest BiometricStatusRepositoryTest
Test: atest BiometricStatusInteractorImplTest
Test: atest DeviceEntrySideFpsOverlayInteractorTest
Test: atest AuthServiceTest
Test: atest KeyguardSecurityContainerControllerTest
Test: atest FingerprintAuthenticationClientTest
Test: atest FingerprintEnrollClientTest
Test: atest SideFpsControllerTest
Test: atest KeyguardBouncerViewModelTest
Test: atest PrimaryBouncerInteractorTest
Test: atest SideFpsOverlayViewModelTest
Test: atest SideFpsOverlayViewBinderTest
Change-Id: Ie375705df9ad4fc54074dde565b9628e4b8c31df

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



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

We've had historically added "-f" as a valid shell command option for
the battery service dumpsys get commands. However, with the current
state of the code, using -f with "get" results in an error.

In an attempt to both fix this error, and to support up-to-date
current-value fetching, we're
[1] Supporting the inclusion of -f option in "get" commands
[2] When -f is used, we schedule update with the health service before
fetching the current value, to help get the latest current value

Bug: 315037695
Test: adb shell dumpsys battery get -f current_now
Change-Id: I8ef1c420005d505b36869b6cea4de095a47e4993

- If we try to merge a transition that closes a pausing task, the task
  will be removed from the pausing set, but not actually handled during
  cleanup and may result in the task being visible momentarily between
  reparenting of the task out of the transition leash (applied in the
  shell) and WM committing the visibility of the task
- When handling a task view transition for a task that going TO_BACK,
  also update the surface visibility if the pending transition is also
  TO_BACK since that is only created when the taskview container's
  surface is destroyed.

Fixes: 310567149
Test: Repro on the bug
Change-Id: I1ba72a2f1b2bcd2b56f55d4c288e86ebf3e53d8c

Change to use generic profile added intent ACTION_PROFILE_ADDED intent
to apply theme

Change isManagedProfile() check to isProfile() to update theme overlay

Bug: 311348071
Test: atest ThemeOverlayControllerTest and Verified theme color by changing manually
Change-Id: I6caf2e9c2480925f00e6a61a899437bf5a80eabf

Mark testNotificationEvent_quotaBump as flaky. am: 33cecbe1 am: aa245772 am: 366464dd am: 215b4e2a am: f8c8751f am: e1303991

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



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