From 0a21051b91c2e07e49eb6fa568c505aee967ab9d Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 24 Jul 2014 13:45:15 -0700 Subject: Camera3: tear down Camera3 streams when they are deleted. Also override the disconnectLocked method in Camera3ZslStream to make sure the Camera3ZslStream specific buffer queue is cleaned up properly. Also revert 0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right fix. Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399 --- services/camera/libcameraservice/device3/Camera3Device.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'services/camera/libcameraservice/device3/Camera3Device.cpp') diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 9d36bfa..44e8822 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1497,6 +1497,9 @@ status_t Camera3Device::configureStreamsLocked() { ALOGV("%s: Camera %d: Stream configuration complete", __FUNCTION__, mId); + // tear down the deleted streams after configure streams. + mDeletedStreams.clear(); + return OK; } -- cgit v1.1