commit 483d25a21058094303b94e44cc67cbd8fecd4bf8
author Sascha Haeberling <haeberling@google.com> Tue Sep 17 22:58:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 17 22:58:48 2013 +0000
tree 7dd051f08f6d914d4aca3456bd9aa92b9fb71b92
parent 4ee4d99cfc519847bd8f84aca9ece5d2b6519536
parent 02db77fc8bdcd6aeb1b36217d939bc11355822e6

Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad

src/com/android/camera/AndroidCameraManagerImpl.java

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index bed7ba7..0c07cbd 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -333,6 +333,9 @@
                         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;
             }