The existing implementation of user switching puts subsequent user switches into a queue if there is already a user switch in progress. For example, if the current user is A and there is a user switch sequence to switch to user B and then to user C, the UserController#switchUser method will put the user switch to C into a pending user switch list and perform it once the existing user switch to B is finished.

However, if the sequence is to switch from user A to user B and then back to user A, and when switch to user A reaches the UserController#switchUser method before the switch to user B is completed, the method will think that the current user is A and that there is no need to switch to user A, and will therefore skip that switch.

The refactored code handles this scenario by adding an extra condition which additionally verifies that there are no further switches scheduled in case the target user is equal to the current user and the switch is going to be skipped.

Bug: 303743201
Test: tested manually with switch user scenario current user is 0 switch to user 10 and then switch back to user 0.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1e3d4f48ab24593ec401ccbc968efbc0a82fea40)
Merged-In: Ia40cfacbee6fc174c90db8e3687838ae01e2858b
Change-Id: Ia40cfacbee6fc174c90db8e3687838ae01e2858b

Change-Id: I7ed8760e1cdd21928ac1669ee7539ec8f12432e4

For example:
Callback1 { sendNewConfiguration }
Callback2 { applySomething }

If Callback1 completes first, its sendNewConfiguration won't take
effect because isWaitingForRemoteDisplayChange is true by the
pending Callback2. And then when Callback2 completes, it only
perform its own operations.

So this change provides a callback from display to make sure its
pending config change can be handled when all remote callbacks
are done.

Fix: 305655839
Test: atest DisplayContentTests#testRemoteDisplayChange
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c793afe3bd45cd5e5a820e67e681483b2c14b8fb)
Merged-In: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
Change-Id: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

[coastguard skipped] Merge sparse cherrypicks from sparse-11049176-L05200030000080823 into udc-qpr1-release.

COASTGUARD_SKIP: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
COASTGUARD_SKIP: I4a5eb219bc198d2edad0be83f7f69feb317883d1

Change-Id: I31909d74df074deb1d429258c0f6185c965f868f

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25201937'] into sparse-11049176-L05200030000080823.
SPARSE_CHANGE: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I4a5eb219bc198d2edad0be83f7f69feb317883d1

For example:
Callback1 { sendNewConfiguration }
Callback2 { applySomething }

If Callback1 completes first, its sendNewConfiguration won't take
effect because isWaitingForRemoteDisplayChange is true by the
pending Callback2. And then when Callback2 completes, it only
perform its own operations.

So this change provides a callback from display to make sure its
pending config change can be handled when all remote callbacks
are done.

Fix: 305655839
Test: atest DisplayContentTests#testRemoteDisplayChange
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c793afe3bd45cd5e5a820e67e681483b2c14b8fb)
Merged-In: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
Change-Id: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

[coastguard skipped] Merge sparse cherrypicks from sparse-11044053-L79500030000063296 into udc-qpr1-release.

COASTGUARD_SKIP: I05478bdafa988fdc0c5c4de88adfc7489e3d9e8e
COASTGUARD_SKIP: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I139d960db650790a618215f268931e19a48350fe

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25201937'] into sparse-11044053-L79500030000063296.
SPARSE_CHANGE: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I05478bdafa988fdc0c5c4de88adfc7489e3d9e8e

For example:
Callback1 { sendNewConfiguration }
Callback2 { applySomething }

If Callback1 completes first, its sendNewConfiguration won't take
effect because isWaitingForRemoteDisplayChange is true by the
pending Callback2. And then when Callback2 completes, it only
perform its own operations.

So this change provides a callback from display to make sure its
pending config change can be handled when all remote callbacks
are done.

Fix: 305655839
Test: atest DisplayContentTests#testRemoteDisplayChange
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c793afe3bd45cd5e5a820e67e681483b2c14b8fb)
Merged-In: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
Change-Id: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

[coastguard skipped] Merge sparse cherrypicks from sparse-11030841-L28900030000046249 into udc-qpr1-release.

COASTGUARD_SKIP: I7666dcf0c5f86a6a1a912a638dca80ecd7fe2484
COASTGUARD_SKIP: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I90e70f4cf78ff6c7c572798aa63f210b206509f7

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25201937'] into sparse-11030841-L28900030000046249.
SPARSE_CHANGE: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I7666dcf0c5f86a6a1a912a638dca80ecd7fe2484

For example:
Callback1 { sendNewConfiguration }
Callback2 { applySomething }

If Callback1 completes first, its sendNewConfiguration won't take
effect because isWaitingForRemoteDisplayChange is true by the
pending Callback2. And then when Callback2 completes, it only
perform its own operations.

So this change provides a callback from display to make sure its
pending config change can be handled when all remote callbacks
are done.

Fix: 305655839
Test: atest DisplayContentTests#testRemoteDisplayChange
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c793afe3bd45cd5e5a820e67e681483b2c14b8fb)
Merged-In: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
Change-Id: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: Ie64c92ae5bd014932c746f338b601354b72da8e4

This reverts commit 58e1c93c.

Reason for revert: b/306964891.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29d48b546d4118caec3cbce0eee528ad6cb5a6ed)
Merged-In: I09f6c9d3570aed0f94385b46f7103e836693e502
Change-Id: I09f6c9d3570aed0f94385b46f7103e836693e502

Change-Id: I436592642f8d2bc3bfd3713ef28dc72ce0c24690

Android Studio uses adb to launch a process for screen mirroring. This
kind of processes is not managed by AMS and run with uid shell or root.
In such a case, that process behaves like a gone Android app so it will
miss display events. This won't impact any normal Android apps.

Check if the uid belongs to an Android app for Android Studio.

Bug: 303684492
Test: Enable display mirroring in Android Studio and check logs
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:380b3932bda7ad87f3180b8f1949d7b2b710b9d6)
Merged-In: I3fb20327979eca8774f7ddf143b2b8f2386e6b56
Change-Id: I3fb20327979eca8774f7ddf143b2b8f2386e6b56

Change-Id: I73f0c9259f8b183c0d5ec7aa73278533d5405d59

This carrier config is ultimately temporary and should be removed in a
future release in favor of just ALWAYS preferring an in-service sim for
a normal routed emergency call.

Test: See other CL in this chain for the tests performed.
Bug: 281934614
Bug: 299150073
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:962c19e2afe932a2dcf1deac46df22dadcb50cf9)
Merged-In: Iac9136dc2315617e612e55ca72026dcae16f232d
Change-Id: Iac9136dc2315617e612e55ca72026dcae16f232d

[coastguard skipped] Merge sparse cherrypicks from sparse-10978663-L86500000963621132 into udc-qpr1-release.

COASTGUARD_SKIP: Id1643b6abc5be162d89c4abe386cfdfaf4a2bae7
COASTGUARD_SKIP: Ieacc78332716aa6628d67ca3227b6995ec7bb49e
COASTGUARD_SKIP: I5093162cbfa632bafe6870c84177952becc82c50

Change-Id: Iebf0afa29a91deb0be8e73eaadc28bdc61e944d4

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102441', 'googleplex-android-review.googlesource.com/25106966'] into sparse-10978663-L86500000963621132.
SPARSE_CHANGE: I5093162cbfa632bafe6870c84177952becc82c50
SPARSE_CHANGE: Ieacc78332716aa6628d67ca3227b6995ec7bb49e

Change-Id: Id1643b6abc5be162d89c4abe386cfdfaf4a2bae7

Add additional traces and logs that will provide more info on when a
draw doesn't proceed due to screen being turned off, content not
visible, or if draw is canceled.

Bug: 284687313
Bug: 305595315
Test: Logcat and perfetto traces
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85c3259e9308c12fbd727cccad002b12628a9ef0)
Merged-In: Ieacc78332716aa6628d67ca3227b6995ec7bb49e
Change-Id: Ieacc78332716aa6628d67ca3227b6995ec7bb49e

- Add logging to registering & unregistering listeners in display
  manager.
- Add logging to follow path of listener notifications

Bug: 284687313
Test: adb shell setprop persist.debug.vri_package <package-name>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9edaca21093acaa3a53af23a1afb736225f3b141)
Merged-In: I5093162cbfa632bafe6870c84177952becc82c50
Change-Id: I5093162cbfa632bafe6870c84177952becc82c50

[coastguard skipped] Merge sparse cherrypicks from sparse-10971902-L45800000963599846 into udc-qpr1-release.

COASTGUARD_SKIP: I5093162cbfa632bafe6870c84177952becc82c50
COASTGUARD_SKIP: Ieacc78332716aa6628d67ca3227b6995ec7bb49e
COASTGUARD_SKIP: Ib55100ede466eb077c88b2f50ec4db73ff3fab99

Change-Id: I1e751196edcef89380b430385147df8adf29735b

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102441', 'googleplex-android-review.googlesource.com/25106966'] into sparse-10971902-L45800000963599846.
SPARSE_CHANGE: I5093162cbfa632bafe6870c84177952becc82c50
SPARSE_CHANGE: Ieacc78332716aa6628d67ca3227b6995ec7bb49e

Change-Id: Ib55100ede466eb077c88b2f50ec4db73ff3fab99

Add additional traces and logs that will provide more info on when a
draw doesn't proceed due to screen being turned off, content not
visible, or if draw is canceled.

Bug: 284687313
Bug: 305595315
Test: Logcat and perfetto traces
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85c3259e9308c12fbd727cccad002b12628a9ef0)
Merged-In: Ieacc78332716aa6628d67ca3227b6995ec7bb49e
Change-Id: Ieacc78332716aa6628d67ca3227b6995ec7bb49e

- Add logging to registering & unregistering listeners in display
  manager.
- Add logging to follow path of listener notifications

Bug: 284687313
Test: adb shell setprop persist.debug.vri_package <package-name>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ab8ba34276a9602d5af1985e7ce9a7460a6ca7d)
Merged-In: I5093162cbfa632bafe6870c84177952becc82c50
Change-Id: I5093162cbfa632bafe6870c84177952becc82c50

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24761638', 'googleplex-android-review.googlesource.com/25104249'] into udc-qpr1-release.

Change-Id: Ibeb1c29d07194732bf7f2494c3a3e988aa1cb524

We're reporting an ANR if the app process doesn't finish
the handling of bindApplication within the BIND_APPLICATION_TIMEOUT.
But very often, due to the contended system resources, the app
process just doesn't get enough CPU time to run.

Also given the bindApplication includes the time the app spends
on Application#onCreate(), now relax the timeout to 20s by default.

Bug: 304484667
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9e814a91321f3ecd32521f83ac5fed20388b7d07)
Merged-In: If8a3db7511ef0b348e9f343fd91de9063f8826f2
Change-Id: If8a3db7511ef0b348e9f343fd91de9063f8826f2

This avoids a race condition where we start receiving events and
trying to send them to the input filter before it's been
installed.

Fix: 290271948
Test: manual:
1. Turn on magnification shortcut button
2. Tap it repeatedly quickly for like 30 seconds
3. Should not crash.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f509803cad6652c79871bb0a7b509ba2d1054b67)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6bf1032b01bbbe6956623ae501f96d9964d0e39b)
Merged-In: I24f0eafb2479ac7427ba28077e45ba26a9127cc8
Change-Id: I24f0eafb2479ac7427ba28077e45ba26a9127cc8

Change-Id: I294620bb34d39443580947141bb917ead11c735c

The first time this method is called for a system-only wallpaper, if the
lock wallpaper is not loaded yet, it will not be aware of the lock
wallpaper and will think that the system wallpaper is sys+lock.

This happens after a reboot + user switch when the secondary user have
two different wallpapers.

This may fix other cases where the lock screen wallpaper is set to same
as home screen

Bug: 300537586
Test: atest WallpaperManagerTest
Test: manually check that the bug is fixed
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58e3cfe430ed60bd4bb56117824d6736831562ef)
Merged-In: Ib37f83233deac7198997910991ffcce75b357aae
Change-Id: Ib37f83233deac7198997910991ffcce75b357aae

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25009816', 'googleplex-android-review.googlesource.com/25057592', 'googleplex-android-review.googlesource.com/25039491', 'googleplex-android-review.googlesource.com/25058689'] into udc-qpr1-release.

Change-Id: I33a526eef1d6aea92378a9cb954d7fcc7555d6ae

Bug: 210537972
Test: NA
(cherry picked from commit a93b4fdf)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:82e838218f45e0af3365f3b5fe4d6346b8ad7a41)
Merged-In: If2f41aea48ac9284ad205debb878d633072431f4
Change-Id: If2f41aea48ac9284ad205debb878d633072431f4

- The split transitions currently don't handle this case properly
  when an adjacent task is launched triggering a split task to
  enter PIP.

Fixes: 303755768
Test: Split YT & Gmail, click link from Gmail
Test: http://recall/-/g6hkB0pXjyQSvfA8STqRAT/hrdzWmMHFGHJKaSyLxb8yh
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f1b98014920a36c55aa5110494f4428e038d51f)
Merged-In: I390ded4075211c8b5c0d328dcda42d189bee1fa8
Change-Id: I390ded4075211c8b5c0d328dcda42d189bee1fa8

Since queued transitions aren't always cleanly chunked
the way we'd imagine them to be, we may end up with
actual events in the transition info if we happen to
be turning screens on/off/foldingat the same time as doing
things with the device.

In this case, the SLEEP transition would have come first
and the actual changes second, so we should assume these
are changes that need to be played.

Test: atest ShellTransitionTests
Bug: 304713150
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce1a438ce1fb20fbf031e37677013f93f32c2b5a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b121eda4ec93492a690458770155158705e7ffce)
Merged-In: I4bbaa8ad033aaadcb1c0b54889b7c81fb003b001
Change-Id: I4bbaa8ad033aaadcb1c0b54889b7c81fb003b001

When they were extracted into a separate method and split by type of
check, we lost some behavior that was guaranteed to be prevented by the
short-circuiting.

This CL makes sure that the checks do not depend on short circuiting by
removing side effect methods from the checks. If the checks pass (we can
animate) we do one last check that will try to enable fakeDrag.

Test: manual
Fixes: 297488363
(cherry picked from commit 9bc94e9c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:77bb4deb7487bf0737b3465b2cdb5a3553c0d10a)
Merged-In: Iebda8c9acfbf75a49522887687702b2e8c0158de
Change-Id: Iebda8c9acfbf75a49522887687702b2e8c0158de

Change-Id: I31b2511c7dc7c792c0f5fdfe48217b9db809e122

* changes:
  [DO NOT MERGE] Revert "Mitigation for mass GC deletion"
  [DO NOT MERGE] Revert "Send cached target duration when creating sessions"

Revert submission 24828717

Reason for revert: performance concerns

Reverted changes: /q/submissionid:24828717

Bug: 300360668
Bug: 302620048

Change-Id: Iefb7488f6e100ca7cbb0d43337e5830860ebebe5