Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Actually wait until the display is ready." into oc-dev

Browse Source 
am: 496267f93b

Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
This commit is contained in:
Michael Wright
2017-06-07 09:00:53 +00:00
committed by android-build-merger
parent a550801c30 496267f93b
commit 9468ded040
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DisplayPowerState.java
View File

@@ -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();