1 files changed, 23 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java
index 92bd953d1..113f4d23b 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -85,10 +85,16 @@ public class AppUpgrader extends SettingsUpgrader {
      * resolution size on the N5 since we stored it with a swapped width/height.
      */
     public static final int NEEDS_N5_16by9_RESOLUTION_SWAP = 7;
+
+    /**
+     * With this version, port over power shutter settings.
+     */
+    private static final int CAMERA_SETTINGS_POWER_SHUTTER = 8;
+
     /**
      * Increment this value whenever new AOSP UpgradeSteps need to be executed.
      */
-    public static final int APP_UPGRADE_VERSION = 7;
+    public static final int APP_UPGRADE_VERSION = 8;
 
     private final AppController mAppController;
 
@@ -160,6 +166,10 @@ public class AppUpgrader extends SettingsUpgrader {
         if (lastVersion < NEEDS_N5_16by9_RESOLUTION_SWAP) {
             updateN516by9ResolutionIfNeeded(settingsManager);
         }
+
+        if (lastVersion < CAMERA_SETTINGS_POWER_SHUTTER) {
+            upgradePowerShutter(settingsManager);
+        }
     }
 
     /**
@@ -431,6 +441,18 @@ public class AppUpgrader extends SettingsUpgrader {
         }
     }
 
+    private void upgradePowerShutter(SettingsManager settingsManager) {
+        SharedPreferences oldGlobalPreferences =
+                settingsManager.openPreferences(OLD_GLOBAL_PREFERENCES_FILENAME);
+        if (oldGlobalPreferences.contains(Keys.KEY_POWER_SHUTTER)) {
+            String powerShutter = removeString(oldGlobalPreferences, Keys.KEY_POWER_SHUTTER);
+            if (OLD_SETTINGS_VALUE_ON.equals(powerShutter)) {
+                settingsManager.set(SettingsManager.SCOPE_GLOBAL, Keys.KEY_POWER_SHUTTER,
+                        true);
+            }
+        }
+    }
+
     /**
      * The R.integer.camera_mode_* indices were cleaned up, resulting in
      * removals and renaming of certain values. In particular camera_mode_gcam