Make module scope prefix a static agent value

This removes the multiple "PhotoModule" strings across
the codebase and allows for retrieval of a module's string
scope prefix as part of its static ModuleAgent properties
rather than as a property of the module itself.

Bug: 19482146
Change-Id: I2c36878dd070106149909f19f98bcae221b94012

1 files changed, 5 insertions, 8 deletions

diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java
index 663a72f35..f2e44b38d 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -413,15 +413,12 @@ public class AppUpgrader extends SettingsUpgrader {
             if (oldModulePreferences != null && oldModulePreferences.getAll().size() > 0) {
                 ModuleManagerImpl.ModuleAgent agent =
                         app.getModuleManager().getModuleAgent(moduleIds[i]);
-                if (agent == null) {
-                    continue;
-                }
-                ModuleController module = agent.createModule(app, null);
-                SharedPreferences newModulePreferences =
-                        settingsManager.openPreferences(CameraActivity.MODULE_SCOPE_PREFIX
-                                + module.getModuleStringIdentifier());
+                if (agent != null) {
+                    SharedPreferences newModulePreferences = settingsManager.openPreferences(
+                            CameraActivity.MODULE_SCOPE_PREFIX + agent.getScopeNamespace());
 
-                copyPreferences(oldModulePreferences, newModulePreferences);
+                    copyPreferences(oldModulePreferences, newModulePreferences);
+                }
             }
         }
     }