diff options
| author | Prashant Malani <pmalani@google.com> | 2014-06-05 23:02:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-05 23:02:42 +0000 |
| commit | 31363809b8eb065021d64f12ff4daf7e3f590529 (patch) | |
| tree | ae50f926efac6a09ea3a83a80d23b1a23aa73880 | |
| parent | 8c2d8c0c27ebd155e9e9d2c066df0297f265b5a6 (diff) | |
| parent | 6a5cacb8683ddd78fc78f01ef726f410bf4e0479 (diff) | |
| download | frameworks_base-31363809b8eb065021d64f12ff4daf7e3f590529.zip frameworks_base-31363809b8eb065021d64f12ff4daf7e3f590529.tar.gz frameworks_base-31363809b8eb065021d64f12ff4daf7e3f590529.tar.bz2 | |
Merge "Change display state modification during dozing"
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 10 |
1 files changed, 8 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 a98c340..654b574 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -555,8 +555,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Turn the screen on. The contents of the screen may not yet // be visible if the electron beam has not been dismissed because // its last frame of animation is solid black. - setScreenState(mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE - ? Display.STATE_DOZING : Display.STATE_ON); + + if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE) { + if (!mScreenBrightnessRampAnimator.isAnimating()) { + setScreenState(Display.STATE_DOZING); + } + } else { + setScreenState(Display.STATE_ON); + } if (mPowerRequest.blockScreenOn && mPowerState.getElectronBeamLevel() == 0.0f) { |