diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-17 16:01:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 16:01:12 -0700 |
| commit | bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f (patch) | |
| tree | 36ad5cb255df25e1687b07cc1256f9796a4f3aa5 | |
| parent | e7c77157c61fb0e09b5a5eec0b977a3b75f7a6eb (diff) | |
| parent | 483d25a21058094303b94e44cc67cbd8fecd4bf8 (diff) | |
| download | android_packages_apps_Snap-bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f.tar.gz android_packages_apps_Snap-bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f.tar.bz2 android_packages_apps_Snap-bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f.zip | |
am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad
* commit '483d25a21058094303b94e44cc67cbd8fecd4bf8':
Don't crash the app if camera is not available.
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index bed7ba72e..0c07cbdb7 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -333,6 +333,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; } |