1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java
index 8d7e57912..a4cc0bb61 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -266,6 +266,15 @@ public class AppUpgrader extends SettingsUpgrader {
             return;
         }
 
+        // infos might be null if the underlying camera device is broken. In
+        // that case, just delete the old settings and force the user to
+        // reselect, it's the least evil solution given we want to only upgrade
+        // settings once.
+        if (infos == null) {
+            settingsManager.remove(SettingsManager.SCOPE_GLOBAL, key);
+            return;
+        }
+
         String pictureSize = settingsManager.getString(SettingsManager.SCOPE_GLOBAL, key);
         int camera = SettingsUtil.getCameraId(infos, facing);
         if (camera != -1) {