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

Merge "Remove a hack to fix a short power button press behavior." into tm-qpr-dev am: 6cb72a5100 am: f369433f13

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

Change-Id: I044d6797f70687fa60409ce2084bee3668235319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2022-12-20 23:58:14 +00:00
committed by Automerger Merge Worker
parent 52ea938a21 f369433f13
commit 28258376b2
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1056,13 +1056,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return;
}
// Don't dream if the user isn't user zero.
// TODO(b/261907079): Move this check to DreamManagerService#canStartDreamingInternal().
if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) {
noDreamAction.run();
return;
}
final DreamManagerInternal dreamManagerInternal = getDreamManagerInternal();
if (dreamManagerInternal == null || !dreamManagerInternal.canStartDreaming(isScreenOn)) {
noDreamAction.run();