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

am: ff7eab2a57

Change-Id: I21ee58b59ce2afefb378f6de51c616f08cc6412e

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

@@ -2032,6 +2032,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();
 }