From 7c881ad57ef6e4e1a2ced01eefedbc6d5ecc4418 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Mon, 28 Nov 2011 18:09:24 +0800
Subject: Fix NPE if the camera cannot be connected.

bug:5673972
Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9
---
 src/com/android/camera/Camera.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         stopPreview();
         // Close the camera now because other activities may need to use it.
         closeCamera();
-        mCameraSound.release();
+        if (mCameraSound != null) mCameraSound.release();
         resetScreenOn();
 
         // Clear UI.
-- 
cgit v1.1