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

Commit 36a8b33a authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev

parents 72119ce8 a27c4aa2

services/camera/libcameraservice/api1/Camera2Client.cpp

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