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

am 6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev

Browse Source 
* commit '6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560':
  Fix auto-brightness adjustment sentinel value.
This commit is contained in:
Jeff Brown
2012-08-22 13:32:46 -07:00
committed by Android Git Automerger
parent 408471a28b 6cf3b925ca
commit de05397815
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/power/PowerManagerService.java
View File

@@ -405,7 +405,7 @@ public final class PowerManagerService extends IPowerManager.Stub
mScreenAutoBrightnessAdjustmentSetting = Settings.System.getFloat(resolver, mScreenAutoBrightnessAdjustmentSetting = Settings.System.getFloat(resolver,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0.0f); Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0.0f);
if (oldScreenAutoBrightnessAdjustmentSetting != mScreenAutoBrightnessAdjustmentSetting) { if (oldScreenAutoBrightnessAdjustmentSetting != mScreenAutoBrightnessAdjustmentSetting) {
mTemporaryScreenAutoBrightnessAdjustmentSettingOverride = -1; mTemporaryScreenAutoBrightnessAdjustmentSettingOverride = Float.NaN;
} }
mScreenBrightnessModeSetting = Settings.System.getInt(resolver, mScreenBrightnessModeSetting = Settings.System.getInt(resolver,
@@ -1347,7 +1347,8 @@ public final class PowerManagerService extends IPowerManager.Stub
} }
private static boolean isValidAutoBrightnessAdjustment(float value) { private static boolean isValidAutoBrightnessAdjustment(float value) {
return !Float.isNaN(value); // Handles NaN by always returning false.
return value >= -1.0f && value <= 1.0f;
} }
private int getDesiredScreenPowerState() { private int getDesiredScreenPowerState() {