commit 6b51d7d119b9ac92e7351bbaf0466398ff4db87a
author Emilian Peev <epeev@google.com> Mon Jul 23 11:41:44 2018 +0100
committer Emilian Peev <epeev@google.com> Mon Jul 23 13:04:34 2018 +0100
tree 19f1f8a5aa94d1cd15ac75296a9d1bed3eb78481
parent 999ad2cf2a0a687abfb7ee147c3261f609cc4806

Camera: Flush in-flight requests during device detach

Improve performance during device detach by flushing all
camera requests.

Bug: 80402005
Test: Camera CTS

Change-Id: I3a6864575b1533c77b5478c2390a908892700f6e

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index 98d0534..18788f2 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -1677,9 +1677,12 @@
 
     // WORKAROUND: HAL refuses to disconnect while there's streams in flight
     {
-        mDevice->clearStreamingRequest();
-
+        int64_t lastFrameNumber;
         status_t code;
+        if ((code = mDevice->flush(&lastFrameNumber)) != OK) {
+            ALOGE("%s: flush failed with code 0x%x", __FUNCTION__, code);
+        }
+
         if ((code = mDevice->waitUntilDrained()) != OK) {
             ALOGE("%s: waitUntilDrained failed with code 0x%x", __FUNCTION__,
                   code);