Camera2: Improve error checking and debug logs.
Bug: 6243944
Change-Id: Ie61d89b733af7d1f653443bf64b767456127a455
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 8cb872a..7db04ff 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -174,11 +174,16 @@
status_t Camera2Device::deleteStream(int id) {
ALOGV("%s: E", __FUNCTION__);
-
bool found = false;
for (StreamList::iterator streamI = mStreams.begin();
streamI != mStreams.end(); streamI++) {
if ((*streamI)->getId() == id) {
+ status_t res = (*streamI)->disconnect();
+ if (res != OK) {
+ ALOGE("%s: Unable to disconnect stream %d from HAL device: "
+ "%s (%d)", __FUNCTION__, id, strerror(-res), res);
+ return res;
+ }
mStreams.erase(streamI);
found = true;
break;