commit c8a6745ac778fdafc83d438a34c5f72c3712d422
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 21 16:40:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 21 16:40:46 2018 +0000
tree af6d5c14bbaea0718cf221cb0f2720b5974c5e89
parent d9f80435b643029819635d15416fcde0b9998829
parent a4833ace01311c64b91f8ff0a2b33d1976af26d2

Merge "Camera: Flush in-flight requests during device detach"

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);