357fe2f190b3 - platform/frameworks/base

commit	357fe2f190b37dc5a31a892761c6c74f081dc192	[log] [tgz]
author	wilsonshih <wilsonshih@google.com>	Mon Oct 04 18:12:30 2021 +0800
committer	Wei Sheng Shih <wilsonshih@google.com>	Wed Nov 17 11:15:49 2021 +0000
tree	bdefb041b7cd9188504a7c444e69562e16345d81
parent	7a937c356eee13df9c217f836427c6a216362e7d [diff]

Use display awake signal to replace screen-off signal for sleep token.

For sleep token, device goingToSleep/awake might be more reliable than
screen on/off since it can be affected by AOD, we can consider this as
a signal to sleep device.
And move the SleepTokenAcquirer to DisplayPolicy, we don't need the
SleepTokenAcquirer interface on ActivityTaskManagerInternal anymore.
Also reuse the acquirer on RootWindowContainer for default display
so there does not need to create another one.

Bug: 199633495
Test: atest KeyguardTests KeyguardTransitionTests
Change-Id: I676cd5855f31d31d7acba9f161d27bdaf58844f1
(cherry picked from commit 0760ca28ea0652639954003564b3e1d35fe8d324)

services/core/java/com/android/server/policy/PhoneWindowManager.java[diff]
services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java[diff]
services/core/java/com/android/server/wm/ActivityTaskManagerService.java[diff]
services/core/java/com/android/server/wm/DisplayContent.java[diff]
services/core/java/com/android/server/wm/DisplayPolicy.java[diff]
services/core/java/com/android/server/wm/KeyguardController.java[diff]
services/core/java/com/android/server/wm/RootWindowContainer.java[diff]

7 files changed