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

Commit 6eac9e2f authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android (Google) Code Review
Browse files

Merge "Camera2Client: flush requests in stopPreviewL" into lmp-mr1-dev

parents 9f932418 2cec0dfa

services/camera/libcameraservice/api1/Camera2Client.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -917,6 +917,15 @@ void Camera2Client::stopPreviewL() { 
                ALOGE("%s: Camera %d: Can't stop streaming: %s (%d)",

                ALOGE("%s: Camera %d: Can't stop streaming: %s (%d)",

                        __FUNCTION__, mCameraId, strerror(-res), res);

                        __FUNCTION__, mCameraId, strerror(-res), res);

            }

            }



            // Flush all in-process captures and buffer in order to stop

            // preview faster.

            res = mDevice->flush();

            if (res != OK) {

                ALOGE("%s: Camera %d: Unable to flush pending requests: %s (%d)",

                        __FUNCTION__, mCameraId, strerror(-res), res);

            }



            res = mDevice->waitUntilDrained();

            res = mDevice->waitUntilDrained();

            if (res != OK) {

            if (res != OK) {

                ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)",

                ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)",