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

DO NOT MERGE Change display state modification during dozing

Browse Source 
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
This commit is contained in:
Prashant Malani
2014-05-27 19:23:59 -07:00
parent 305f3e216a
commit 448a4e59ad
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,8 +706,14 @@ final class DisplayPowerController {
// 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) {