commit 6d6ddb4a81c77b6455a1e1116f63991c254b4aaf
author Alex Ray <aray@google.com> Wed May 08 14:51:38 2013 -0700
committer Alex Ray <aray@google.com> Wed May 08 15:33:03 2013 -0700
tree 9316beaa92bcf41dbdfc21fcc4ca10ff6f62735d
parent 18720028f1c9d20f82664bc9c0aa8596c80d5ff9

camera: Fix NPE in FOV test

Bug: 8484377
Change-Id: I66c0cc41450f403cf59533feded4dec85ba1b948

apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
index fdd5597..913ff4f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
@@ -120,9 +120,11 @@
             @Override
             public void onClick(View v) {
                 // Stop camera until preview sizes have been obtained.
-                mCamera.stopPreview();
-                mCamera.release();
-                mCamera = null;
+                if (mCamera != null) {
+                    mCamera.stopPreview();
+                    mCamera.release();
+                    mCamera = null;
+                }
 
                 mPreviewSizeCamerasToProcess.clear();
                 mPreviewSizes =  new Size[Camera.getNumberOfCameras()];