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

am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

Browse Source 
* commit '17a764431a71ff91cbd9272d592fdcd15a9c7539':
  Dismiss color fade when it is no longer used.
This commit is contained in:
Michael Lentine
2015-09-23 05:25:58 +00:00
committed by Android Git Automerger
parent fd5cb76ed6 17a764431a
commit 0d93002af0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -837,6 +837,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mPendingScreenOff && target != Display.STATE_OFF) {
setScreenState(Display.STATE_OFF);
mPendingScreenOff = false;
mPowerState.dismissColorFade();
}
if (target == Display.STATE_ON) {
@@ -910,6 +911,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// A black surface is already hiding the contents of the screen.
setScreenState(Display.STATE_OFF);
mPendingScreenOff = false;
mPowerState.dismissColorFade();
} else if (performScreenOffTransition
&& mPowerState.prepareColorFade(mContext,
mColorFadeFadesConfig ?