From 0b2bdd9f43119957d97280257a59dec19b7651e6 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>
Date: Fri, 10 Jan 2014 16:36:50 +0530
Subject: 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
---
 src/com/android/camera/AndroidCameraManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/com/android/camera')

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;
-- 
cgit v1.2.3