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

Commit 9af42b9e authored by Jyoti Bhayana's avatar Jyoti Bhayana Committed by Android (Google) Code Review
Browse files

Merge "Camera multi-client fix bug in notifyError" into main

parents 65467e68 da2ecaff

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2328,9 +2328,8 @@ void CameraDeviceClient::notifyError(int32_t errorCode, 
                                     const CaptureResultExtras& resultExtras) {

    // Thread safe. Don't bother locking.

    sp<hardware::camera2::ICameraDeviceCallbacks> remoteCb = getRemoteCallback();



    bool skipClientNotification = false;

    if (flags::camera_multi_client() && mSharedMode) {

    if (flags::camera_multi_client() && mSharedMode && (resultExtras.requestId != -1)) {

        int clientReqId;

        if (!matchClientRequest(resultExtras, &clientReqId)) {

            return;