summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-01-10 15:52:08 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-01-10 15:52:08 +0000
commitd62c655f28ebfcff689ff040ddd1e744e887875e (patch)
treede94fcf40f9ece0d2f4120d0076e3f382d02202b
parentf4df08e197071b330d342aa3cfe8c0bffd13dbc8 (diff)
parent921ec3a90316e7343941f1cfab9ca0ab6c19ee68 (diff)
Merge "Don't check wakefulness before setting sandman summoned to false."
-rw-r--r--services/core/java/com/android/server/power/PowerManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index ed4ba0d0eacd..7f8f40626c56 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3202,8 +3202,7 @@ public final class PowerManagerService extends SystemService
}
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 {