summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2022-12-29 17:17:25 +0000
committer Bryce Lee <brycelee@google.com> 2023-02-10 23:06:14 +0000
commit0d512c67d1a04e0e6b39238b8f9ec57df9966039 (patch)
treebf3495f7997c96d593a5c4cdb2c36c87430cd567
parent7dddb47ad9a48565714be27867595b8498af3795 (diff)
Don't check wakefulness before setting sandman summoned to false.
Bug: 260886786 Change-Id: I5908e4dc5d4cc6d79d2bce71c06302fa634661ed Test: atest FrameworksServicesTests:PowerManagerServiceTest (cherry picked from commit 96c9ea6cc2559feb7983a91d6cef50ebf1b37f18)
-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 651bb930c49b..5d1a5810a01e 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 @@ 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 {