commit a987db923b070148ebd42cb4a502f05702630d33
author Emilian Peev <epeev@google.com> Wed Oct 23 15:32:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 23 15:32:41 2019 -0700
tree 31cfbdfbb4e1dfd41067d5c3909d2116c7841f90
parent 8219d3feeb33a046ac39c81426ac00c898b1f6ea
parent ff7eab2a57ff31501e9da98bdc2c633c4996eae5

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

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index d93d26f..08fb153 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -2032,6 +2032,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();
 }