commit ac3e2cce871b7cdbb0526d4af9d0bc477e795b2e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 04 09:55:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 09:55:23 2017 +0000
tree 4df0c3b8c8665299ad3436119f175f198ae34476
parent 03857c4b5a029a588b647532e907a875026e593a
parent ba0fac313cc2451681f62a398253c2c01c1c61e7

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

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 4502612..980ba39 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2895,6 +2895,13 @@
                     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 "