diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-27 18:24:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 18:24:38 +0000 |
| commit | bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5 (patch) | |
| tree | 245db06e6631e54475adba627ddca262947a2f6d /camera/tests | |
| parent | 4b6ed7f255b696d1555ce71633ea08c961ec51dd (diff) | |
| parent | 65d7986ceac6e35426749ac7e05bbd2a38949db4 (diff) | |
| download | frameworks_av-bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5.zip frameworks_av-bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5.tar.gz frameworks_av-bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5.tar.bz2 | |
Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
Diffstat (limited to 'camera/tests')
| -rw-r--r-- | camera/tests/ProCameraTests.cpp | 3 |
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(); |