diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-04 16:04:30 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-04 16:04:30 -0800 |
| commit | ce860996e59dcf4ebcabb9b6801971098a3e88b5 (patch) | |
| tree | f04bc01520a79359b6622032e4fd15e75b99ac78 | |
| parent | bcb478ad4fb1cd976922ba94b178dfdbd38a203b (diff) | |
| parent | 0b2bdd9f43119957d97280257a59dec19b7651e6 (diff) | |
| download | android_packages_apps_Snap-ce860996e59dcf4ebcabb9b6801971098a3e88b5.tar.gz android_packages_apps_Snap-ce860996e59dcf4ebcabb9b6801971098a3e88b5.tar.bz2 android_packages_apps_Snap-ce860996e59dcf4ebcabb9b6801971098a3e88b5.zip | |
Merge "Camera: Add checker for null pointer exception during camera release"
| -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 1f8d69b9a..f833cb279 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -216,6 +216,9 @@ class AndroidCameraManagerImpl implements CameraManager { return; case RELEASE: + if (mCamera == null) { + return; + } mCamera.release(); mCamera = null; return; |