summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/AndroidCameraManagerImpl.java
diff options
context:
space:
mode:
authorSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-01-10 16:36:50 +0530
committerSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-01-13 18:25:15 +0530
commit0b2bdd9f43119957d97280257a59dec19b7651e6 (patch)
treecc195da92757c33d48c194a6f7e6927ba5cbf2fa /src/com/android/camera/AndroidCameraManagerImpl.java
parent2bacfda103f09d7e963a074384fab596f60c5b9e (diff)
downloadandroid_packages_apps_Snap-0b2bdd9f43119957d97280257a59dec19b7651e6.tar.gz
android_packages_apps_Snap-0b2bdd9f43119957d97280257a59dec19b7651e6.tar.bz2
android_packages_apps_Snap-0b2bdd9f43119957d97280257a59dec19b7651e6.zip
Camera: Add checker for null pointer exception during camera release
In current code, handler will still try to execute command even camera is closed, so add null point checker to skip these commands ( cherrypicked from commit 63ae64c56b00f44956502822a0ddb96307ae7270 ) Change-Id: I71c30a5293364e084de650e92d9d0926e7e3d7c1 CRs-Fixed: 598600
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java3
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;