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

Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev

Browse Source 
am: a02f168525

* commit 'a02f168525a78e58def8e55f655e50b0dbaaeb55':
  Clear mPendingScreenOff and stop color fade animiation if screen is on
This commit is contained in:
Chong Zhang
2016-02-17 01:23:11 +00:00
committed by android-build-merger
parent cce53e1040 a02f168525
commit c68c507479
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -840,7 +840,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// If there is already an animation in progress, don't interfere with it.
if (mColorFadeOnAnimator.isStarted()
|| mColorFadeOffAnimator.isStarted()) {
return;
if (target != Display.STATE_ON) {
return;
}
// If display state changed to on, proceed and stop the color fade and turn screen on.
mPendingScreenOff = false;
}
// If we were in the process of turning off the screen but didn't quite