Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't check wakefulness before setting sandman summoned to false." into tm-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-02-13 22:40:24 +00:00
committed by Android (Google) Code Review
parent c573766a07 0d512c67d1
commit 35512533d3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -3262,8 +3262,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 {