commit 0c82e02258cf31347b16d1c1c305bb31490098bb
author Eino-Ville Talvala <etalvala@google.com> Tue Sep 25 12:32:25 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 25 12:32:25 2012 -0700
tree 21cc632f36cd9a1c45570fe15aa458f77d3dccaa
parent d2b4224e356e363bf753d246d805da4cf7481097
parent c7d9afdc7d2181aef7688638fff52859bcdabd65

am c7d9afdc: Camera2: Make sure to clean out reprocess streams on shutdown as well.

* commit 'c7d9afdc7d2181aef7688638fff52859bcdabd65':
  Camera2: Make sure to clean out reprocess streams on shutdown as well.

services/camera/libcameraservice/Camera2Device.cpp

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 @@
             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) {