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

Commit ee4d3e1e 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: 6bad1e88

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

Change-Id: I1f9dd37204351596cb652d7297e82e2c471d036f
parents c4c02d63 6bad1e88

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) {