From 02db77fc8bdcd6aeb1b36217d939bc11355822e6 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Tue, 17 Sep 2013 15:36:13 -0700
Subject: Don't crash the app if camera is not available.

  Bug: 10747001

Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
---
 src/com/android/camera/AndroidCameraManagerImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 00fe905a9..65dc13728 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -329,6 +329,9 @@ class AndroidCameraManagerImpl implements CameraManager {
                         Log.e(TAG, "Fail to release the camera.");
                     }
                     mCamera = null;
+                } else if (mCamera == null) {
+                  Log.w(TAG, "Cannot handle message, mCamera is null.");
+                  return;
                 }
                 throw e;
             }
@@ -347,7 +350,7 @@ class AndroidCameraManagerImpl implements CameraManager {
     }
 
     /**
-     * A class which implements {@link CameraManager.CameraProxy} and 
+     * A class which implements {@link CameraManager.CameraProxy} and
      * camera handler thread.
      */
     public class AndroidCameraProxyImpl implements CameraManager.CameraProxy {
-- 
cgit v1.2.3