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

Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev

Browse Source
This commit is contained in:
Prashant Malani
2014-06-05 23:03:19 +00:00
committed by Android (Google) Code Review
parent 89b6bf5a11 448a4e59ad
commit 42db3761c9
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) {