[CaptureIntentModule] Dont' dispatch startPreview call

[android-x86/packages-apps-Camera2.git] / src / com / android / camera / captureintent / state / StateStartingPreview.java

diff --git a/src/com/android/camera/captureintent/state/StateStartingPreview.java b/src/com/android/camera/captureintent/state/StateStartingPreview.java
index bb2ed5a..445a4ff 100644 (file)
--- a/src/com/android/camera/captureintent/state/StateStartingPreview.java
+++ b/src/com/android/camera/captureintent/state/StateStartingPreview.java
@@ -101,11 +101,13 @@ public final class StateStartingPreview extends State {
             @Override
             public void run() {
                 mResourceSurfaceTexture.get().setPreviewSize(previewSize);
-                mResourceOpenedCamera.get().startPreview(
-                        mResourceSurfaceTexture.get().createPreviewSurface(),
-                        mCaptureReadyCallback);
             }
         });
+        // Start preview right away. Don't dispatch it on other threads or it
+        // will cause race condition. b/19522251.
+        mResourceOpenedCamera.get().startPreview(
+                mResourceSurfaceTexture.get().createPreviewSurface(),
+                mCaptureReadyCallback);
         return Optional.absent();
     }