diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-07-11 00:32:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-11 00:32:27 +0000 |
| commit | d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8 (patch) | |
| tree | 7e2f33b0c368fc0378bad7fca83f0903c366931f /tests/camera2 | |
| parent | 49f58811ea29ff8bed5e307d8018ead075731881 (diff) | |
| parent | 5ad8086ad70b5c67222745ed55e6edf2ed715c81 (diff) | |
| download | hardware_libhardware-d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8.zip hardware_libhardware-d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8.tar.gz hardware_libhardware-d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8.tar.bz2 | |
Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
Diffstat (limited to 'tests/camera2')
| -rw-r--r-- | tests/camera2/CameraModuleTests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp index 2e85d81..2b6c757 100644 --- a/tests/camera2/CameraModuleTests.cpp +++ b/tests/camera2/CameraModuleTests.cpp @@ -120,7 +120,7 @@ TEST_F(CameraModuleTest, GetCameraInfoBadIndices) { for (unsigned i = 0; i < sizeof(idx)/sizeof(idx[0]); ++i) { struct camera_info info; EXPECT_NE(OK, mModule->getCameraInfo(idx[i], &info)); - EXPECT_EQ(-ENODEV, mModule->getCameraInfo(idx[i], &info)) + EXPECT_EQ(-EINVAL, mModule->getCameraInfo(idx[i], &info)) << "Incorrect error code for get_camera_info idx= " << idx[i]; } |