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

Merge changes from topic 'am-b66c4552aecc498fa98e74359e122115'

Browse Source 
* changes:
  Merge \\"Prevent brightness changes before boot complete.\\" into nyc-mr1-dev am: fbd93027e4 am: 6d0c9ffc5c am: 6108fe0cb9
  Prevent brightness changes before boot complete. am: 9f818ea463 am: 16890dd980 am: 3905506938
  Merge \\"Cap minimum visibilty of floating windows by the real size.\\" into nyc-mr1-dev am: 7f96551b03 am: 8616408535 am: e4c00dd151
This commit is contained in:
Android Build Merger (Role)
2016-08-01 21:47:45 +00:00
committed by Android (Google) Code Review
parent 921891518a 0c2405ebf8
commit 213d4ba895
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/power/PowerManagerService.java
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;