commit 898ad176cd9f017629c3fdd6c50ed4afb56cbfc1
author Eino-Ville Talvala <etalvala@google.com> Fri Mar 06 13:23:18 2015 -0800
committer Eino-Ville Talvala <etalvala@google.com> Mon Mar 09 12:54:15 2015 -0700
tree d666b0c414aa06f2820e66de0e759329ecd0325c
parent 453c790395b24f6ea046a457ed005683fda829b7

Camera tests: Adjust for framework device interface changes

Account for requirement to pass in dataspace in stream creation.

Change-Id: Ibc5af912ef4a55b787c70843fc82422977a02c0b

tests/camera2/CameraMultiStreamTests.cpp

diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp
index df8e623..1edc28e 100644
--- a/tests/camera2/CameraMultiStreamTests.cpp
+++ b/tests/camera2/CameraMultiStreamTests.cpp
@@ -208,7 +208,7 @@
         void SetUp() {
             ASSERT_EQ(OK,
                 mDevice->createStream(mNativeWindow,
-                    mWidth, mHeight, mFormat,
+                    mWidth, mHeight, mFormat, HAL_DATASPACE_UNKNOWN,
                     &mStreamId));
 
             ASSERT_NE(-1, mStreamId);

tests/camera2/CameraStreamFixture.h

diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h
index cc13169..ff110d8 100644
--- a/tests/camera2/CameraStreamFixture.h
+++ b/tests/camera2/CameraStreamFixture.h
@@ -257,6 +257,7 @@
         ASSERT_EQ(OK,
             device->createStream(mNativeWindow,
                 mWidth, mHeight, format,
+                HAL_DATASPACE_UNKNOWN,
                 &mStreamId));
 
         ASSERT_NE(-1, mStreamId);