tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am fb40d5de: camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)

Browse source 
* commit 'fb40d5de36fc93a1a3cab9c2cd73988ac52043a2':
  camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
This commit is contained in:
Igor Murashkin 2013-03-27 15:44:56 -07:00 committed by Android Git Automerger
commit 72757adef9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/camera2/CameraModuleFixture.h
View file

@ -59,7 +59,7 @@ struct CameraModuleFixture {
mNumberOfCameras = mModule->get_number_of_cameras();
ASSERT_LE(0, mNumberOfCameras);
ASSERT_EQ(
ASSERT_LE(
CAMERA_MODULE_API_VERSION_2_0, mModule->common.module_api_version)
<< "Wrong module API version";

4
tests/camera2/camera2.cpp
View file

@ -60,10 +60,10 @@ class Camera2Test: public testing::Test {
}
int16_t version2_0 = CAMERA_MODULE_API_VERSION_2_0;
ASSERT_EQ(version2_0, module->module_api_version)
ASSERT_LE(version2_0, module->module_api_version)
<< "Camera module version is 0x"
<< std::hex << module->module_api_version
<< ", not 2.0. (0x"
<< ", should be at least 2.0. (0x"
<< std::hex << CAMERA_MODULE_API_VERSION_2_0 << ")";
sCameraModule = reinterpret_cast<camera_module_t*>(module);