commit 7c881ad57ef6e4e1a2ced01eefedbc6d5ecc4418
author Wu-cheng Li <wuchengli@google.com> Mon Nov 28 18:09:24 2011 +0800
committer Wu-cheng Li <wuchengli@google.com> Mon Nov 28 18:12:51 2011 +0800
tree bfe8db62c9add5ff4c473c2aa86c9c2ebf5dec0a
parent 749d056cd82ebfe6e613596d9e22dd355aeeec41

Fix NPE if the camera cannot be connected.

bug:5673972
Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 90621c8..a391e20 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1578,7 +1578,7 @@
         stopPreview();
         // Close the camera now because other activities may need to use it.
         closeCamera();
-        mCameraSound.release();
+        if (mCameraSound != null) mCameraSound.release();
         resetScreenOn();
 
         // Clear UI.