Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b158d8a6 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android Git Automerger
Browse files

am e80b229a: Merge "cameraservice: remove record stream in stopPreview" into lmp-dev 

* commit 'e80b229a':
  cameraservice: remove record stream in stopPreview
parents b1dcd095 e80b229a

services/camera/libcameraservice/api1/Camera2Client.cpp

+7 −0
Original line number Diff line number Diff line
@@ -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);