Protect Camera2 functions from null CameraDeviceInfo

When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.

Bug: 16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae

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 ef2acd433..9b78e2ff6 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -265,6 +265,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) {