From a27c4aa222c8dd1712617dad954c5f3aa68d5427 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 4 Sep 2013 18:18:26 -0700 Subject: [PATCH] camera: Fix race condition between setParameters() and stopPreview(). Bug: 10414772 Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9 --- services/camera/libcameraservice/api1/Camera2Client.cpp | 1 + 1 file changed, 1 insertion(+) 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)", -- 2.11.0