diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-07-22 16:57:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:29:55 +0000 |
| commit | e80b229a80a992cb14647bcc7bfa8c926dc65fe6 (patch) | |
| tree | 9847b3682ea06ce9d986a772b362eb883733003e /services | |
| parent | eeaf40a8e413780bd2aacde172ac820e2ce12eb3 (diff) | |
| parent | 28d0327bc80e1e424c3db34c62e8f73cd5ffab1e (diff) | |
| download | frameworks_av-e80b229a80a992cb14647bcc7bfa8c926dc65fe6.zip frameworks_av-e80b229a80a992cb14647bcc7bfa8c926dc65fe6.tar.gz frameworks_av-e80b229a80a992cb14647bcc7bfa8c926dc65fe6.tar.bz2 | |
Merge "cameraservice: remove record stream in stopPreview" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 1642896..9721e13 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -906,6 +906,13 @@ void Camera2Client::stopPreviewL() { ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); } + // Clean up recording stream + res = mStreamingProcessor->deleteRecordingStream(); + if (res != OK) { + ALOGE("%s: Camera %d: Unable to delete recording stream before " + "stop preview: %s (%d)", + __FUNCTION__, mCameraId, strerror(-res), res); + } // no break case Parameters::WAITING_FOR_PREVIEW_WINDOW: { SharedParameters::Lock l(mParameters); |