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

Commit 857c27aa authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Try to remove inflight requests during error notifications"... 

Merge "Camera: Try to remove inflight requests during error notifications" into oc-dev am: ac3e2cce
am: 6d875c51

Change-Id: Ic1eaa896e2ee40fe78ff9ce3e872632c2f4f31b7
parents c2393156 6d875c51

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −0
Original line number Diff line number Diff line
@@ -2895,6 +2895,13 @@ void Camera3Device::notifyError(const camera3_error_msg_t &msg, 
                    InFlightRequest &r = mInFlightMap.editValueAt(idx);

                    r.requestStatus = msg.error_code;

                    resultExtras = r.resultExtras;

                    if (hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_RESULT ==

                            errorCode) {

                        // In case of missing result check whether the buffers

                        // returned. If they returned, then remove inflight

                        // request.

                        removeInFlightRequestIfReadyLocked(idx);

                    }

                } else {

                    resultExtras.frameNumber = msg.frame_number;

                    ALOGE("Camera %s: %s: cannot find in-flight request on "