From a3916a4a07fe47281567ac54e94ecb079051cee8 Mon Sep 17 00:00:00 2001
From: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>
Date: Tue, 30 Dec 2014 20:35:26 +0530
Subject: SnapdragonCamera: Fix camera double open issue.

If switch camera occurs before open camera thread completes, it
will result in camera double open exception. Hence wait for open
thread and then do switch.

Change-Id: Id12f149a2b850dc7cf1c872cec016c95e604f713
---
 src/com/android/camera/PhotoModule.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/com')

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 32cd5dcf7..5d556b2fe 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -655,6 +655,14 @@ public class PhotoModule
         setCameraId(mCameraId);
 
         // from onPause
+        try {
+            if (mOpenCameraThread != null) {
+                mOpenCameraThread.join();
+                mOpenCameraThread = null;
+            }
+        } catch (InterruptedException ex) {
+            // ignore
+        }
         closeCamera();
         mUI.collapseCameraControls();
         mUI.clearFaces();
-- 
cgit v1.2.3