commit a27c4aa222c8dd1712617dad954c5f3aa68d5427
author Ruben Brunk <rubenbrunk@google.com> Wed Sep 04 18:18:26 2013 -0700
committer Ruben Brunk <rubenbrunk@google.com> Thu Sep 05 18:37:49 2013 +0000
tree bf70a487ec2ca5b69f216796ceaf6e822daf0b6c
parent c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc

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

Bug: 10414772
Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9

services/camera/libcameraservice/api1/Camera2Client.cpp

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