1 files changed, 22 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java
index 113f4d23b..277960728 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -92,9 +92,14 @@ public class AppUpgrader extends SettingsUpgrader {
     private static final int CAMERA_SETTINGS_POWER_SHUTTER = 8;
 
     /**
+     * With this version, port over max brightness settings.
+     */
+    private static final int CAMERA_SETTINGS_MAX_BRIGHTNESS = 9;
+
+    /**
      * Increment this value whenever new AOSP UpgradeSteps need to be executed.
      */
-    public static final int APP_UPGRADE_VERSION = 8;
+    public static final int APP_UPGRADE_VERSION = 9;
 
     private final AppController mAppController;
 
@@ -170,6 +175,10 @@ public class AppUpgrader extends SettingsUpgrader {
         if (lastVersion < CAMERA_SETTINGS_POWER_SHUTTER) {
             upgradePowerShutter(settingsManager);
         }
+
+        if (lastVersion < CAMERA_SETTINGS_MAX_BRIGHTNESS) {
+            upgradeMaxBrightness(settingsManager);
+        }
     }
 
     /**
@@ -453,6 +462,18 @@ public class AppUpgrader extends SettingsUpgrader {
         }
     }
 
+    private void upgradeMaxBrightness(SettingsManager settingsManager) {
+        SharedPreferences oldGlobalPreferences =
+                settingsManager.openPreferences(OLD_GLOBAL_PREFERENCES_FILENAME);
+        if (oldGlobalPreferences.contains(Keys.KEY_MAX_BRIGHTNESS)) {
+            String maxBrightness = removeString(oldGlobalPreferences, Keys.KEY_MAX_BRIGHTNESS);
+            if (OLD_SETTINGS_VALUE_ON.equals(maxBrightness)) {
+                settingsManager.set(SettingsManager.SCOPE_GLOBAL, Keys.KEY_MAX_BRIGHTNESS,
+                        true);
+            }
+        }
+    }
+
     /**
      * The R.integer.camera_mode_* indices were cleaned up, resulting in
      * removals and renaming of certain values. In particular camera_mode_gcam