commit 704cc2f600c8d754efe25d3672dcd773cc16c49f
author Dianne Hackborn <hackbod@google.com> Mon Apr 23 18:22:13 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Mon Apr 23 18:22:13 2012 -0700
tree b0b61a3628cbbabd05d49004173684b40b365b0d
parent f1e26a1bb3b200d3db7fc3dbabf09f4b5a143568

Deal correctly with an unset brightness adjustment.

Change-Id: I191051989bad68f31210bbc717fbabd59d4585a1

src/com/android/settings/BrightnessPreference.java

diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index fb25e9b..e015914 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -134,19 +134,16 @@
     private int getBrightness() {
         int mode = getBrightnessMode(0);
         float brightness = 0;
-        try {
-            if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
-                brightness = Settings.System.getFloat(getContext().getContentResolver(),
-                        Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ);
-                brightness = (brightness+1)/2;
-            } else {
-                brightness = Settings.System.getInt(getContext().getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS);
-                brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim)
-                        / (brightness - mScreenBrightnessDim);
-                
-            }
-        } catch (SettingNotFoundException snfe) {
+        if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+            brightness = Settings.System.getFloat(getContext().getContentResolver(),
+                    Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
+            brightness = (brightness+1)/2;
+        } else {
+            brightness = Settings.System.getInt(getContext().getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS, 100);
+            brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim)
+                    / (brightness - mScreenBrightnessDim);
+            
         }
         return (int)(brightness*10000);
     }