Merge "Don't check wakefulness before setting sandman summoned to false." am: d62c655f28
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:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user