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

Commit 042c7f33 authored by Sean Stout's avatar Sean Stout Committed by Automerger Merge Worker
Browse files

Merge "Fix screen not turning off correctly." into sc-dev am: 1d0ef86d 

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

Change-Id: I1538a734f88947b431c204a25ce973dd905a3e56
parents e1ad9b60 1d0ef86d

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2957,8 +2957,7 @@ public final class PowerManagerService extends SystemService 
                // Group has been removed.

                // Group has been removed.

                return;

                return;

            }

            }

            // TODO (b/175764708): Support per-display doze.

            wakefulness = mDisplayGroupPowerStateMapper.getWakefulnessLocked(groupId);

            wakefulness = getWakefulnessLocked();

            if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) &&

            if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) &&

                    mDisplayGroupPowerStateMapper.isSandmanSummoned(groupId)

                    mDisplayGroupPowerStateMapper.isSandmanSummoned(groupId)

                    && mDisplayGroupPowerStateMapper.isReady(groupId)) {

                    && mDisplayGroupPowerStateMapper.isReady(groupId)) {
@@ -3100,6 +3099,7 @@ public final class PowerManagerService extends SystemService 
     * Returns true if the device is allowed to doze in its current state.

     * Returns true if the device is allowed to doze in its current state.

     */

     */

    private boolean canDozeLocked() {

    private boolean canDozeLocked() {

        // TODO (b/175764708): Support per-display doze.

        return getWakefulnessLocked() == WAKEFULNESS_DOZING;

        return getWakefulnessLocked() == WAKEFULNESS_DOZING;

    }

    }