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 am: 496267f93b

Browse Source 
am: d581113dc1

Change-Id: I6a9d56e5c6678a1e1d75e9cf74c27362e288a7b3
This commit is contained in:
Michael Wright
2017-06-07 08:37:47 +00:00
committed by android-build-merger
parent a550801c30 d581113dc1
commit 428bb9a193
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();