From bedbfd3163f43e4e7db2d4d7daeaf9ec93036350 Mon Sep 17 00:00:00 2001 From: Will Leshner Date: Mon, 12 Dec 2022 17:42:42 -0800 Subject: [PATCH] Remove a hack to fix a short power button press behavior. A hack was introduced in ag/20583933 to fix an issue with short power button press when not the primary user (basically, in this case, the screen should turn off but instead nothing happened). The underlying issue has been fixed, so this change removes the hack. Bug: 260135090 Test: manually by setting up a secondary user and then verifying that the device will screen off on power button press. Change-Id: Ia1303dea4c3b72f7b72e069912286e6e9666b491 --- .../java/com/android/server/policy/PhoneWindowManager.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index dbe049a8e18ec..de0d1f8f76afb 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1049,13 +1049,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();