1 files changed, 8 insertions, 0 deletions
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();