Prevent brightness changes before boot complete. am: 9f818ea463

am: 16890dd980

Change-Id: I8241a67326b055c8cabc261d5671553ff056e198
This commit is contained in:
Michael Wright
2016-08-01 13:22:54 +00:00
committed by android-build-merger

View File

@@ -2085,7 +2085,12 @@ public final class PowerManagerService extends SystemService
float screenAutoBrightnessAdjustment = 0.0f; float screenAutoBrightnessAdjustment = 0.0f;
boolean autoBrightness = (mScreenBrightnessModeSetting == boolean autoBrightness = (mScreenBrightnessModeSetting ==
Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC); 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; screenBrightness = mScreenBrightnessOverrideFromWindowManager;
autoBrightness = false; autoBrightness = false;
brightnessSetByUser = false; brightnessSetByUser = false;