diff options
| author | Adrian Roos <roosa@google.com> | 2014-05-14 19:02:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 19:02:18 +0000 |
| commit | 9e317da9364bae6a7d40c94cd46748b2255c7e1e (patch) | |
| tree | fd56759025aef4199051503d2dbe2a5601ce849d | |
| parent | 3c659dea477fd11fc4a498a0c7bc119fe431ecc8 (diff) | |
| parent | 6dee605c834fe4926cc1ae5c584563bdb2b608a1 (diff) | |
| download | frameworks_base-9e317da9364bae6a7d40c94cd46748b2255c7e1e.zip frameworks_base-9e317da9364bae6a7d40c94cd46748b2255c7e1e.tar.gz frameworks_base-9e317da9364bae6a7d40c94cd46748b2255c7e1e.tar.bz2 | |
Merge "Fix adaptive auto brightness bugs"
| -rw-r--r-- | services/core/java/com/android/server/display/AutomaticBrightnessController.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index af0c56b..4740cae 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -201,7 +201,7 @@ class AutomaticBrightnessController { public void updatePowerState(DisplayManagerInternal.DisplayPowerRequest request) { if (setScreenAutoBrightnessAdjustment(request.screenAutoBrightnessAdjustment) - || setLightSensorEnabled(request.wantLightSensorEnabled())) { + | setLightSensorEnabled(request.wantLightSensorEnabled())) { updateAutoBrightness(false /*sendUpdate*/); } } diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index a5eccb3..03941c6 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -538,6 +538,9 @@ public final class PowerManagerService extends com.android.server.SystemService resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.SCREEN_BRIGHTNESS_MODE), false, mSettingsObserver, UserHandle.USER_ALL); + resolver.registerContentObserver(Settings.System.getUriFor( + Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ), + false, mSettingsObserver, UserHandle.USER_ALL); resolver.registerContentObserver(Settings.Global.getUriFor( Settings.Global.LOW_POWER_MODE), false, mSettingsObserver, UserHandle.USER_ALL); |