commit 930d536567fae7e900df2c6626614adf0f43ea7c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 10 17:02:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 10 17:02:30 2023 +0000
tree 7cc5e8d1de4d8ef1b102d8747c6900445331201a
parent a14f67409669bf341cbc744a736dad67866d159e
parent 7b2f589098b00ac78154869ff41c94dd112c0c2b

Merge "Merge "Ensure weakly referenced callback fields are kept" into tm-qpr-dev am: 71d0f222f1" into tm-qpr-dev-plus-aosp

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 923dc2e..6fb7af1 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3262,8 +3262,7 @@
             }
             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 {