diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-06 01:21:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-06 01:21:52 +0000 |
| commit | 36a8b33a23dca49c9617e97e22e5d67f7d25c268 (patch) | |
| tree | 259ccf6447eeb22fb45240665ac1620eadd420c5 | |
| parent | 72119ce833d4f0e1c0342f1722d1433f2ba12b87 (diff) | |
| parent | a27c4aa222c8dd1712617dad954c5f3aa68d5427 (diff) | |
| download | frameworks_av-36a8b33a23dca49c9617e97e22e5d67f7d25c268.zip frameworks_av-36a8b33a23dca49c9617e97e22e5d67f7d25c268.tar.gz frameworks_av-36a8b33a23dca49c9617e97e22e5d67f7d25c268.tar.bz2 | |
Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ 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)", |