commit a76823b50c01d37b23b15ee3c6f9f17e94d354ac
author Alex Ray <aray@google.com> Wed May 08 16:58:53 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 08 16:58:53 2013 -0700
tree 7735a59806145da3ac76fd6800d9c766f5c2f3af
parent e1ac6911ff70b7922fbbccb390a7fa0251606b00
parent 353a2c1661b2b7f4a83cab393d19df38e04870c5

am 353a2c16: Merge "camera: Fix NPE in FOV test" into jb-mr2-dev

* commit '353a2c1661b2b7f4a83cab393d19df38e04870c5':
  camera: Fix NPE in FOV test

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()];