diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-17 15:36:13 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-09-17 15:36:13 -0700 |
| commit | 02db77fc8bdcd6aeb1b36217d939bc11355822e6 (patch) | |
| tree | f51ea915a4becc7d7a7b1a79b3ac66d939c828bc | |
| parent | d688c0c31d4287c03b664f6fca5c6498a1e4bd7d (diff) | |
| download | android_packages_apps_Snap-02db77fc8bdcd6aeb1b36217d939bc11355822e6.tar.gz android_packages_apps_Snap-02db77fc8bdcd6aeb1b36217d939bc11355822e6.tar.bz2 android_packages_apps_Snap-02db77fc8bdcd6aeb1b36217d939bc11355822e6.zip | |
Don't crash the app if camera is not available.
Bug: 10747001
Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |