commit 01510dc5268a5320a289640abb92a58bc20e3c5a
author Emilian Peev <epeev@google.com> Wed Oct 23 15:19:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 23 15:19:37 2019 -0700
tree 1d8cccdd5a51e06025ec20fe73d0d118254e3260
parent c48e0ae6ba2542b05de39d3ec22c073146ffc494
parent f16f21366cbc91778d3e4c57d0d679dafd274d1f

Merge "Camera: Release all composite streams during "detachDevice"" into qt-qpr1-dev
am: f16f21366c

Change-Id: Idaa9d7ac68e69e1c8bdc93fd6ed8afde36f67bf3

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index c7a4f2b..3587db3 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -2004,6 +2004,15 @@
         }
     }
 
+    for (size_t i = 0; i < mCompositeStreamMap.size(); i++) {
+        auto ret = mCompositeStreamMap.valueAt(i)->deleteInternalStreams();
+        if (ret != OK) {
+            ALOGE("%s: Failed removing composite stream  %s (%d)", __FUNCTION__,
+                    strerror(-ret), ret);
+        }
+    }
+    mCompositeStreamMap.clear();
+
     Camera2ClientBase::detachDevice();
 }