am d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev

* commit 'd95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
  Camera2 tests: Fix incorrect error code check
This commit is contained in:
Eino-Ville Talvala 2015-07-13 07:20:03 +00:00 committed by Android Git Automerger
commit 9811566033

View file

@ -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];
}