summaryrefslogtreecommitdiffstats
path: root/camera/tests
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-03-27 11:07:06 -0700
committerIgor Murashkin <iam@google.com>2013-03-27 11:23:54 -0700
commit65d7986ceac6e35426749ac7e05bbd2a38949db4 (patch)
tree41fe024c821e0cbcf8763f6525066c7fd3eb398e /camera/tests
parenta97d15e2e2f0b317a345d3a6f02df80b8988b1f6 (diff)
downloadframeworks_av-65d7986ceac6e35426749ac7e05bbd2a38949db4.zip
frameworks_av-65d7986ceac6e35426749ac7e05bbd2a38949db4.tar.gz
frameworks_av-65d7986ceac6e35426749ac7e05bbd2a38949db4.tar.bz2
ProCamera: Fix memory leak in consumeFrameMetadata
Bug: 8402301 Change-Id: I975990185f45bb8552712271b9ac457af08a170c
Diffstat (limited to 'camera/tests')
-rw-r--r--camera/tests/ProCameraTests.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp
index ecc0854..87f817a 100644
--- a/camera/tests/ProCameraTests.cpp
+++ b/camera/tests/ProCameraTests.cpp
@@ -1021,6 +1021,9 @@ TEST_F(ProCameraTest, WaitForDualStreamBuffer) {
// Consume two frames simultaneously. Unsynchronized by timestamps.
for (int i = 0; i < REQUEST_COUNT; ++i) {
+ // Exhaust event queue so it doesn't keep growing
+ while (mListener->ReadEvent() != UNKNOWN);
+
// Get the metadata
EXPECT_OK(mCamera->waitForFrameMetadata());
CameraMetadata meta = mCamera->consumeFrameMetadata();