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

Commit 6d875c51 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" into oc-dev 

am: ac3e2cce

Change-Id: I19f4376ed1269e5a91600c1000367cf60727ddcc
parents 7c6e1d82 ac3e2cce

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 "