commit d46ac0034a0fe7b700c4f39499dd22c2c5da5300
author Paul Rohde <codelogic@google.com> Mon May 11 11:29:21 2015 -0700
committer Paul Rohde <codelogic@google.com> Mon May 11 11:34:42 2015 -0700
tree 1979b4db895e8af24810c3eb68ca51c46a784136
parent edd5f8086326786390a7c74dda3f0a6c9ba933b5

Hide no active camera NPE by defaulting to camera device -1

NPE's can occur if no camera device is currently active. It's
not feasable to rewire all parts of the codebase for this
release to properly access the target camera device. This
fix may lead to inconsistent setting persistance if in places
where a NPE would otherwise occur.

Bug: 21026362

Change-Id: I76c5b5fab429f61238a1ba91c0c52e839a431573

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 3aa3558..08b3ba9 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -102,6 +102,7 @@
 import com.android.camera.data.VideoItemFactory;
 import com.android.camera.debug.Log;
 import com.android.camera.device.ActiveCameraDeviceTracker;
+import com.android.camera.device.CameraId;
 import com.android.camera.filmstrip.FilmstripContentPanel;
 import com.android.camera.filmstrip.FilmstripController;
 import com.android.camera.module.ModuleController;
@@ -1050,8 +1051,14 @@
         // this could cause user issues, so log a stack trace noting the call path
         // which resulted in this scenario.
 
-        return SettingsManager.getCameraSettingScope(
-                mCameraController.getCurrentCameraId().getValue());
+        CameraId cameraId =  mCameraController.getCurrentCameraId();
+
+        if(cameraId == null) {
+            Log.e(TAG,  "Retrieving Camera Setting Scope with -1");
+            return SettingsManager.getCameraSettingScope("-1");
+        }
+
+        return SettingsManager.getCameraSettingScope(cameraId.getValue());
     }
 
     @Override

src/com/android/camera/app/CameraController.java

diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java
index 2c4353e..7921335 100644
--- a/src/com/android/camera/app/CameraController.java
+++ b/src/com/android/camera/app/CameraController.java
@@ -113,6 +113,7 @@
     }
 
     @Override
+    @Deprecated
     public CameraId getCurrentCameraId() {
         return mActiveCameraDeviceTracker.getActiveOrPreviousCamera();
     }