commit f816eea8f1604841866e530453f956063af624bd
author Jianing Wei <jianingwei@google.com> Thu Apr 10 14:17:57 2014 -0700
committer Jianing Wei <jianingwei@google.com> Thu Apr 10 14:17:57 2014 -0700
tree bcd59f7faab196f7b7819825a121a273d08f0374
parent 692231f348076dc98724342e21ac9e67c7b0334e

Camera2 test: fix build break due to change in camera service.

Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae

tests/camera2/CameraMultiStreamTests.cpp

diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp
index 75c7139..c7db679 100644
--- a/tests/camera2/CameraMultiStreamTests.cpp
+++ b/tests/camera2/CameraMultiStreamTests.cpp
@@ -380,11 +380,13 @@
                 waitLimit = exposures[i] * EXP_WAIT_MULTIPLIER;
             }
 
+            CaptureResult result;
             CameraMetadata frameMetadata;
             int32_t resultRequestId;
             do {
                 ASSERT_EQ(OK, mDevice->waitForNextFrame(waitLimit));
-                ASSERT_EQ(OK, mDevice->getNextFrame(&frameMetadata));
+                ASSERT_EQ(OK, mDevice->getNextResult(&result));
+                frameMetadata = result.mMetadata;
 
                 camera_metadata_entry_t resultEntry = frameMetadata.find(ANDROID_REQUEST_ID);
                 ASSERT_EQ(1u, resultEntry.count);