diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-07-20 18:39:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-20 18:39:33 -0700 |
| commit | e78d5c7bfda1e80223436df3faeb4a9e2e719bcf (patch) | |
| tree | 6aa675b9bac094a8af8f7d5b7a931c0c2c21f6d9 /services | |
| parent | 789e325341e73743630f45e92b77d07e31c3957e (diff) | |
| parent | 2267106c98f461b730c772a913da946c391a178c (diff) | |
| download | frameworks_av-e78d5c7bfda1e80223436df3faeb4a9e2e719bcf.zip frameworks_av-e78d5c7bfda1e80223436df3faeb4a9e2e719bcf.tar.gz frameworks_av-e78d5c7bfda1e80223436df3faeb4a9e2e719bcf.tar.bz2 | |
Merge "Camera2: Stop preview: Wait until HAL is drained"
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index a115ef4..f21a518 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -592,6 +592,7 @@ void Camera2Client::stopPreviewLocked() { // TODO: Handle record stop here case PREVIEW: mDevice->setStreamingRequest(NULL); + mDevice->waitUntilDrained(); case WAITING_FOR_PREVIEW_WINDOW: mState = STOPPED; break; |