From 2609176b48f86e68ce50629298b252397a19f463 Mon Sep 17 00:00:00 2001
From: Jack Yoo <jyoo@codeaurora.org>
Date: Thu, 14 Jan 2016 12:35:35 -0800
Subject: SnapdragonCamera: Adding current camera null check

Adding null check on potential race condition case.

Change-Id: Ia837acbdf5fbef824d55b318d9cbddf8a8faf7ef
CRs-Fixed: 961548
---
 src/com/android/camera/AndroidCameraManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index e67c7b463..d36b500e0 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -739,7 +739,8 @@ class AndroidCameraManagerImpl implements CameraManager {
         public void onAutoFocusMoving(
                 final boolean moving, android.hardware.Camera camera) {
             final android.hardware.Camera currentCamera = mCamera.getCamera();
-
+            if(currentCamera == null)
+                return;
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-- 
cgit v1.2.3