diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-10-20 08:35:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 08:35:43 -0700 |
| commit | 30dae69d0ec4daae57177bc8fd352c3c810b3171 (patch) | |
| tree | 39299c0c06fbc0cd41af1282f9110242817bad0f | |
| parent | 62546767541adbce7672f678bdaa26bbf22d9b64 (diff) | |
| parent | 71d40934176ee23be9a91ca0aa33656e1cce8ce6 (diff) | |
| download | LegacyCamera-30dae69d0ec4daae57177bc8fd352c3c810b3171.zip LegacyCamera-30dae69d0ec4daae57177bc8fd352c3c810b3171.tar.gz LegacyCamera-30dae69d0ec4daae57177bc8fd352c3c810b3171.tar.bz2 | |
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.
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ public class Camera extends ActivityBase implements FocusManager.Listener, 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)); } |