commit ff7eab2a57ff31501e9da98bdc2c633c4996eae5
author Emilian Peev <epeev@google.com> Wed Oct 23 15:26:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 23 15:26:39 2019 -0700
tree 2f68d5ff7da61153da6702aba670149784a5fe89
parent 89f3994620c9b19ece47694680b3c3aad594d924
parent 01510dc5268a5320a289640abb92a58bc20e3c5a

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

Change-Id: Id88dc89d3cf99266e34211aa72b4e99bb259c40d

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