Prevent brightness changes before boot complete. am: 9f818ea463 am: 16890dd980

am: 3905506938

Change-Id: Ie6f3b6d55acb0e4eae40518962c1afbd70a947c2
This commit is contained in:
Michael Wright
2016-08-01 21:45:40 +00:00
committed by android-build-merger

View File

@@ -2086,7 +2086,12 @@ public final class PowerManagerService extends SystemService
float screenAutoBrightnessAdjustment = 0.0f;
boolean autoBrightness = (mScreenBrightnessModeSetting ==
Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {
if (!mBootCompleted) {
// Keep the brightness steady during boot. This requires the
// bootloader brightness and the default brightness to be identical.
autoBrightness = false;
brightnessSetByUser = false;
} else if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {
screenBrightness = mScreenBrightnessOverrideFromWindowManager;
autoBrightness = false;
brightnessSetByUser = false;