diff options
| author | Michael Lentine <mlentine@google.com> | 2015-09-25 00:31:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-25 00:31:24 +0000 |
| commit | cb13da9772b41c3466c3ed514e6321c2cfb85c2a (patch) | |
| tree | 33c6318b3c2316fef1c5df84639ad35c6a405251 /services | |
| parent | f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4 (diff) | |
| parent | 68eafe7f883d9963f0b91506b9e618766c854b49 (diff) | |
| download | frameworks_base-cb13da9772b41c3466c3ed514e6321c2cfb85c2a.zip frameworks_base-cb13da9772b41c3466c3ed514e6321c2cfb85c2a.tar.gz frameworks_base-cb13da9772b41c3466c3ed514e6321c2cfb85c2a.tar.bz2 | |
Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 533f425..452378f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -837,7 +837,6 @@ 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) { @@ -911,7 +910,6 @@ 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 ? |