summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-24 13:44:07 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-25 12:12:40 -0700
commitc62bb787e53fc4b400219567585b365a5792412c (patch)
tree819f2acbf132ef789148d1b15422235b62f7f81d /services/camera/libcameraservice
parent852c381dbd1a9f86e6759201b50ac8847a1c3e3c (diff)
downloadframeworks_av-c62bb787e53fc4b400219567585b365a5792412c.zip
frameworks_av-c62bb787e53fc4b400219567585b365a5792412c.tar.gz
frameworks_av-c62bb787e53fc4b400219567585b365a5792412c.tar.bz2
Camera2: Make sure to clean out reprocess streams on shutdown as well.
Otherwise, streams may persist past expected lifetime. Bug: 6243944 Change-Id: I901971b78baf9d577ea3812588dec3885232e7ef
Diffstat (limited to 'services/camera/libcameraservice')
-rw-r--r--services/camera/libcameraservice/Camera2Device.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 49f0795..2e4098e 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -145,6 +145,7 @@ status_t Camera2Device::disconnect() {
ALOGW("%s: Closing camera device %d with %d requests in flight!",
__FUNCTION__, mId, inProgressCount);
}
+ mReprocessStreams.clear();
mStreams.clear();
res = mDevice->common.close(&mDevice->common);
if (res != OK) {