Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b13bb5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I51e0bb777b3d12dd40c5aceb18a451dcbab39916
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30e24cd0 d62c655f

services/core/java/com/android/server/power/PowerManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -3202,8 +3202,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 {