diff options
| author | Senpo Hu <senpo@google.com> | 2015-03-23 23:02:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 23:02:41 +0000 |
| commit | 90db65676b53f591ca4333c35768cd7e2c8d49ed (patch) | |
| tree | 996354d15c7a7c587f3079c3a74b598c90a283ce /src/com/android/camera/settings/AppUpgrader.java | |
| parent | 75384f97d5db98182503c9d76dae98357470e000 (diff) | |
| parent | 00562dd0a8451eda80815b3d8fdcb8075e4b9db6 (diff) | |
| download | android_packages_apps_Camera2-90db65676b53f591ca4333c35768cd7e2c8d49ed.tar.gz android_packages_apps_Camera2-90db65676b53f591ca4333c35768cd7e2c8d49ed.tar.bz2 android_packages_apps_Camera2-90db65676b53f591ca4333c35768cd7e2c8d49ed.zip | |
Merge "OneCameraOpener should inform ActiveCameraDeviceTracker about camera open." into ub-camera-haleakala
Diffstat (limited to 'src/com/android/camera/settings/AppUpgrader.java')
| -rw-r--r-- | src/com/android/camera/settings/AppUpgrader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java index 6b8bc1cd0..730220f6a 100644 --- a/src/com/android/camera/settings/AppUpgrader.java +++ b/src/com/android/camera/settings/AppUpgrader.java @@ -402,8 +402,8 @@ public class AppUpgrader extends SettingsUpgrader { settingsManager.openPreferences( OLD_CAMERA_PREFERENCES_PREFIX + cameraIds[i]); SharedPreferences newCameraPreferences = - settingsManager.openPreferences(CameraActivity.CAMERA_SCOPE_PREFIX - + cameraIds[i]); + settingsManager.openPreferences( + SettingsManager.getCameraSettingScope(cameraIds[i])); copyPreferences(oldCameraPreferences, newCameraPreferences); } @@ -424,7 +424,7 @@ public class AppUpgrader extends SettingsUpgrader { app.getModuleManager().getModuleAgent(moduleIds[i]); if (agent != null) { SharedPreferences newModulePreferences = settingsManager.openPreferences( - CameraActivity.MODULE_SCOPE_PREFIX + agent.getScopeNamespace()); + SettingsManager.getModuleSettingScope(agent.getScopeNamespace())); copyPreferences(oldModulePreferences, newModulePreferences); } |