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

@@ -2004,6 +2004,15 @@ void CameraDeviceClient::detachDevice() {
         }
     }
 
+    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();
 }