From 704cc2f600c8d754efe25d3672dcd773cc16c49f Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 23 Apr 2012 18:22:13 -0700 Subject: [PATCH] Deal correctly with an unset brightness adjustment. Change-Id: I191051989bad68f31210bbc717fbabd59d4585a1 --- .../settings/BrightnessPreference.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index fb25e9b000b..e015914aa53 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -134,19 +134,16 @@ public class BrightnessPreference extends SeekBarDialogPreference implements 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); }