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." am: d62c655f28

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2382812

Change-Id: I51e0bb777b3d12dd40c5aceb18a451dcbab39916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-10 16:27:24 +00:00
committed by Automerger Merge Worker
parent 30e24cd0e6 d62c655f28
commit 7b13bb5c1b
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

@@ -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 {