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

Commit 2ad98629 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Actually wait until the display is ready." into oc-dev am: 496267f9 

am: d581113d

Change-Id: If144b976ba2e5e375760b1f26f8472533a5b20cc
parents a550801c d581113d

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

+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ final class DisplayPowerState { 
                    mPendingBacklight = backlight;



                    boolean changeInProgress = mStateChangeInProgress || mBacklightChangeInProgress;

                    mStateChangeInProgress = stateChanged;

                    mBacklightChangeInProgress = backlightChanged;

                    mStateChangeInProgress = stateChanged || mStateChangeInProgress;

                    mBacklightChangeInProgress = backlightChanged || mBacklightChangeInProgress;



                    if (!changeInProgress) {

                        mLock.notifyAll();