am: c48e304b

Change-Id: I7258810e7e1d4a7ad8dcf60efcf8ea6226137167

Merge "Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am: 672f578f" into oc-dr1-dev-plus-aosp

am: 672f578f

Change-Id: Ief696630315b5c1910c8a0721417260b1caab2d0

am: 5f04958a

Change-Id: I051734bc2fe8fd08b36756d66e3a52025fd465bc

am: b167ed08

Change-Id: I9beb7a7ee639f614260e5ba69496c0e7d9836742

am: cee0ac5f  -s ours

Change-Id: I711d3a31445d3fc694b0289fa9323d5220abd713

am: 602b7be0

Change-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546

am: b9d0a22a

Change-Id: I4350ef8f09371b73ad1155ed2297627e66acc9d8

am: a42c8a16  -s ours

Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7

am: 53ddffdf

Change-Id: I42729d1a98ec4272671fa8ae8da7ccb6798a82fa

Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592

am: 089d45de

Change-Id: Ica95fc3e55e3291dd43bd5173899cf30a328021e

Removed unnecessary templatization argument.

Test: hidl_test_java
Bug: 32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3

am: 5898d521

Change-Id: Iec3589b58bf218f9bae61de60cb0a90ff2932277

am: cb423e42

Change-Id: I37bedda77be7b9d832da8dd4e9efeab714ac8d66

am: 5f62026b

Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261

When taking a snapshot, always include the full stack bounds.

When showing a snapshot starting window, use the SystemUI flags
from the top fullscreen window in the task - this is the same way
as we do it when the real windows are going to be visible.

Test: Revoke contacts permissions, launch contacts, go to recents,
go back.
Test: go/wm-smoke
Fixes: 63268663

Change-Id: If8d9701f6d34abd56116ed04fe27fe82688e506a

am: 928aad3e

Change-Id: I11c65cd3194427fc43fe0cea445715d1f8ce2254

When pulsing from AOD, we force the display OFF first. This allows
us to transition smoothly from AOD.

Also, we add a scrim transition for whenever we are waking up from
dozing. This relies on I4f3a863709a970f0fc8682c0a0c3547886e1fd0f
which forces the DOZE -> ON transition through OFF first.

Also fixes the WAKE_AND_UNLOCK transition that happens when waking
up with the fingerprint sensor.

Also fix an issue where KeyguardViewMediator's mWakeAndUnlocking
was cleared in onScreenTurnedOff; this should have been added to
the wakefulness lifecycle instead and now that the AOD -> ON transtion
dispatches the screen off callback it broke the fingerprint unlock
transition.

Fixes: 35849781
Fixes: 63887857
Fixes: 63783651
Fixes: 63727166
Test: AOD, receive notification; AOD, unlock with fingerprint; AOD, wake to lockscreen. Verify that everything is flicker-free.
Change-Id: I7d539db80a1c7e9216cf4c5c1e6d314c1893f12d

am: 8b8a0ef5

Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f

am: 3d423c9c

Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121

am: e0a743d0

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41

am: 6b4f0bb6

Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926

Commit c10fe5f4 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.

This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801

am: f8469ccf

Change-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89

am: 860f185c

Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e