Merge "Don't check wakefulness before setting sandman summoned to false."

This commit is contained in:
Treehugger Robot
2023-01-10 15:52:08 +00:00
committed by Gerrit Code Review

View File

@@ -3202,8 +3202,7 @@ public final class PowerManagerService extends SystemService
} }
final PowerGroup powerGroup = mPowerGroups.get(groupId); final PowerGroup powerGroup = mPowerGroups.get(groupId);
wakefulness = powerGroup.getWakefulnessLocked(); wakefulness = powerGroup.getWakefulnessLocked();
if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) && if (powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
startDreaming = canDreamLocked(powerGroup) || canDozeLocked(powerGroup); startDreaming = canDreamLocked(powerGroup) || canDozeLocked(powerGroup);
powerGroup.setSandmanSummonedLocked(/* isSandmanSummoned= */ false); powerGroup.setSandmanSummonedLocked(/* isSandmanSummoned= */ false);
} else { } else {