Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a flicker when short pressing power button." into tm-qpr-dev am: 75b95761c8

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

Change-Id: I4174ebd97adfb6c6994b8b406215609e42d805eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2022-12-15 23:59:27 +00:00
committed by Automerger Merge Worker
parent 3ae991218c 75b95761c8
commit 5ed450284d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1051,12 +1051,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return; return;
} }
// Make sure the device locks. Unfortunately, this has the side-effect of briefly revealing
// the lock screen before the dream appears. Note that this locking behavior needs to
// happen regardless of whether we end up dreaming (below) or not.
// TODO(b/261662912): Find a better way to lock the device that doesn't result in jank.
lockNow(null);
// Don't dream if the user isn't user zero. // Don't dream if the user isn't user zero.
// TODO(b/261907079): Move this check to DreamManagerService#canStartDreamingInternal(). // TODO(b/261907079): Move this check to DreamManagerService#canStartDreamingInternal().
if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) { if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) {
@@ -1070,6 +1064,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return; return;
} }
// Make sure the device locks. Unfortunately, this has the side-effect of briefly revealing
// the lock screen before the dream appears. Note that locking is a side-effect of the no
// dream action that is executed if we early return above.
// TODO(b/261662912): Find a better way to lock the device that doesn't result in jank.
lockNow(null);
dreamManagerInternal.requestDream(); dreamManagerInternal.requestDream();
} }