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

Commit 1d0ef86d authored by Sean Stout's avatar Sean Stout Committed by Android (Google) Code Review
Browse files

Merge "Fix screen not turning off correctly." into sc-dev

parents 0d2041de 7b7621f5

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

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

                return;

            }

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

            wakefulness = getWakefulnessLocked();

            wakefulness = mDisplayGroupPowerStateMapper.getWakefulnessLocked(groupId);

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

                    mDisplayGroupPowerStateMapper.isSandmanSummoned(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.

     */

    private boolean canDozeLocked() {

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

        return getWakefulnessLocked() == WAKEFULNESS_DOZING;

    }