diff options
-rw-r--r-- | services/core/java/com/android/server/display/ColorFade.java | 16 | ||||
-rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 835ba1734da3..a16fcd2fa112 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -587,16 +587,16 @@ final class ColorFade { Slog.e(TAG, "Unable to create surface.", ex); return false; } - } - mSurfaceControl.setLayerStack(mDisplayLayerStack); - mSurfaceControl.setSize(mDisplayWidth, mDisplayHeight); - mSurface = new Surface(); - mSurface.copyFrom(mSurfaceControl); + mSurfaceControl.setLayerStack(mDisplayLayerStack); + mSurfaceControl.setSize(mDisplayWidth, mDisplayHeight); + mSurface = new Surface(); + mSurface.copyFrom(mSurfaceControl); - mSurfaceLayout = new NaturalSurfaceLayout(mDisplayManagerInternal, - mDisplayId, mSurfaceControl); - mSurfaceLayout.onDisplayTransaction(); + mSurfaceLayout = new NaturalSurfaceLayout(mDisplayManagerInternal, + mDisplayId, mSurfaceControl); + mSurfaceLayout.onDisplayTransaction(); + } } finally { SurfaceControl.closeTransaction(); } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 433d8876dee7..b74b0f2e3caa 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -673,6 +673,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call slowChange = false; } mAppliedDimming = true; + } else if (mAppliedDimming) { + slowChange = false; + mAppliedDimming = false; } // If low power mode is enabled, cut the brightness level by half @@ -685,6 +688,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call slowChange = false; } mAppliedLowPower = true; + } else if (mAppliedLowPower) { + slowChange = false; + mAppliedLowPower = false; } // Animate the screen brightness when the screen is on or dozing. |