From: Ruben Brunk <rubenbrunk@google.com>
Date: Thu, 5 Sep 2013 01:18:26 +0000 (-0700)
Subject: camera: Fix race condition between setParameters() and stopPreview().
X-Git-Tag: android-x86-4.4-r1~146^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a27c4aa222c8dd1712617dad954c5f3aa68d5427;p=android-x86%2Fframeworks-av.git

camera: Fix race condition between setParameters() and stopPreview().

Bug: 10414772
Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
---

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 3d9fe016ff..0a18501968 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -854,6 +854,7 @@ void Camera2Client::stopPreviewL() {
             // no break
         case Parameters::RECORD:
         case Parameters::PREVIEW:
+            syncWithDevice();
             res = stopStream();
             if (res != OK) {
                 ALOGE("%s: Camera %d: Can't stop streaming: %s (%d)",