diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-19 17:27:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-19 17:27:28 +0000 |
| commit | 147814cd4c2231400aa6a2ea633f7c342498bc7d (patch) | |
| tree | f55ab4f2776d7a13d1b9fc9a36a373406a7c9cf1 /tests | |
| parent | a45b4721d9b2bf37ad11ffcb4996e73a6bf4743c (diff) | |
| parent | 5407ef1ec28742c5c60b04aae6c68835bb8c75fe (diff) | |
| download | hardware_libhardware-147814cd4c2231400aa6a2ea633f7c342498bc7d.zip hardware_libhardware-147814cd4c2231400aa6a2ea633f7c342498bc7d.tar.gz hardware_libhardware-147814cd4c2231400aa6a2ea633f7c342498bc7d.tar.bz2 | |
Merge "Camera: Fix tests per camera service interface change"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index 1edc28e..bfadfea 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -209,7 +209,7 @@ public: ASSERT_EQ(OK, mDevice->createStream(mNativeWindow, mWidth, mHeight, mFormat, HAL_DATASPACE_UNKNOWN, - &mStreamId)); + CAMERA3_STREAM_ROTATION_0, &mStreamId)); ASSERT_NE(-1, mStreamId); } diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index ff110d8..8a8c27d 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -258,6 +258,7 @@ protected: device->createStream(mNativeWindow, mWidth, mHeight, format, HAL_DATASPACE_UNKNOWN, + CAMERA3_STREAM_ROTATION_0, &mStreamId)); ASSERT_NE(-1, mStreamId); |