Merge "Don't check wakefulness before setting sandman summoned to fal…

…se." am: d62c655 am: 7b13bb5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2382812 Change-Id: Ia0f675e60d12739cd275b8441136d61b1d35befa Signed-off-by: Automerger Merge Worker <[email protected]>
aosp-mirror · Jan 10, 2023 · a14f674 · a14f674
2 parents 2de20bb + 7b13bb5
commit a14f674
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3262,8 +3262,7 @@ private void handleSandman(int groupId) { // runs on handler thread
             }
             final PowerGroup powerGroup = mPowerGroups.get(groupId);
             wakefulness = powerGroup.getWakefulnessLocked();
-            if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) &&
-                    powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
+            if (powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
                 startDreaming = canDreamLocked(powerGroup) || canDozeLocked(powerGroup);
                 powerGroup.setSandmanSummonedLocked(/* isSandmanSummoned= */ false);
             } else {