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

Commit c2a7ee19 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Only update the display when brightness and state are valid." into... 

Merge "Only update the display when brightness and state are valid." into sc-dev am: 10db7a41 am: a41ffb9c

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

Change-Id: I8751ca41793cc94016292bdbb42758df3becac9b
parents 08075a14 a41ffb9c

services/core/java/com/android/server/display/DisplayPowerState.java

+4 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ final class DisplayPowerState { 
     * Updates the state of the screen and backlight asynchronously on a separate thread.

     */

    private final class PhotonicModulator extends Thread {

        private static final int INITIAL_SCREEN_STATE = Display.STATE_OFF; // unknown, assume off

        private static final int INITIAL_SCREEN_STATE = Display.STATE_UNKNOWN;

        private static final float INITIAL_BACKLIGHT_FLOAT = PowerManager.BRIGHTNESS_INVALID_FLOAT;



        private final Object mLock = new Object();
@@ -494,7 +494,9 @@ final class DisplayPowerState { 
                    if (!backlightChanged) {

                        mBacklightChangeInProgress = false;

                    }

                    if (!stateChanged && !backlightChanged) {

                    boolean valid = state != Display.STATE_UNKNOWN && !Float.isNaN(brightnessState);

                    boolean changed = stateChanged || backlightChanged;

                    if (!valid || !changed) {

                        try {

                            mLock.wait();

                        } catch (InterruptedException ex) {