Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev

am: 390bb3216d

Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c

src/com/android/settings/display/BrightnessLevelPreferenceController.java

@@ -142,7 +142,7 @@ public class BrightnessLevelPreferenceController extends PreferenceController im
             final float value = Settings.System.getFloat(mContentResolver,
                     System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
             // auto brightness is between -1 and 1
-            return ((value + 1)) / 2;
+            return getPercentage(value, -1, 1);
         }
         final double value = Settings.System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS,
                 mMinBrightness);
@@ -150,6 +150,12 @@ public class BrightnessLevelPreferenceController extends PreferenceController im
     }
 
     private double getPercentage(double value, int min, int max) {
+        if (value > max) {
+            return 1.0;
+        }
+        if (value < min) {
+            return 0.0;
+        }
         return (value - min) / (max - min);
     }