commit 30dae69d0ec4daae57177bc8fd352c3c810b3171
author Wu-cheng Li <wuchengli@google.com> Thu Oct 20 08:35:43 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 20 08:35:43 2011 -0700
tree 39299c0c06fbc0cd41af1282f9110242817bad0f
parent 62546767541adbce7672f678bdaa26bbf22d9b64
parent 71d40934176ee23be9a91ca0aa33656e1cce8ce6

am 71d40934: Merge "Fix camera app crash when failed open the camera." into ics-mr0

* commit '71d40934176ee23be9a91ca0aa33656e1cce8ce6':
  Fix camera app crash when failed open the camera.

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index a7fa1d9..249fd98 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1495,8 +1495,10 @@
 
         if (mFirstTimeInitialized) {
             mOrientationListener.disable();
-            mImageSaver.finish();
-            mImageSaver = null;
+            if (mImageSaver != null) {
+                mImageSaver.finish();
+                mImageSaver = null;
+            }
             if (!mIsImageCaptureIntent && mThumbnail != null && !mThumbnail.fromFile()) {
                 mThumbnail.saveTo(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME));
             }