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 am: 7b13bb5c1b

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

Change-Id: Ia0f675e60d12739cd275b8441136d61b1d35befa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-10 17:01:22 +00:00
committed by Automerger Merge Worker
parent 2de20bb6d7 7b13bb5c1b
commit a14f674096
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);
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 {