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

Commit f0a6b8bc authored by Zhijun He's avatar Zhijun He Committed by Android Git Automerger
Browse files

am 72a2f171: Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev 

* commit '72a2f171':
  Camera: setCallBackWindow only if callback surface is used
parents fcb7a247 72a2f171

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ void Camera2Client::setPreviewCallbackFlagL(Parameters &params, int flag) { 
    }

    if (params.previewCallbackFlags != (uint32_t)flag) {



        if (flag != CAMERA_FRAME_CALLBACK_FLAG_NOOP) {

        if (params.previewCallbackSurface && flag != CAMERA_FRAME_CALLBACK_FLAG_NOOP) {

            // Disable any existing preview callback window when enabling

            // preview callback flags

            res = mCallbackProcessor->setCallbackWindow(NULL);