Merge "Change display state modification during dozing" (31363809) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayPowerController.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -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) {