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

Merge "Camera: fix camera_metadata address expectation" into oc-dev

Browse source 
am: e812feb56f

Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57
This commit is contained in:
Yin-Chia Yeh 2017-06-16 19:37:00 +00:00 committed by android-build-merger
commit 8bc10783a9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View file

@ -1678,7 +1678,8 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) {
ASSERT_EQ(Status::OK, status);
const camera_metadata_t* metadata = (camera_metadata_t*) chars.data();
size_t expectedSize = chars.size();
ASSERT_EQ(0, validate_camera_metadata_structure(metadata, &expectedSize));
int result = validate_camera_metadata_structure(metadata, &expectedSize);
ASSERT_TRUE(result == 0 || result == CAMERA_METADATA_VALIDATION_SHIFTED);
size_t entryCount = get_camera_metadata_entry_count(metadata);
// TODO: we can do better than 0 here. Need to check how many required
// characteristics keys we've defined.
@ -1995,8 +1996,9 @@ TEST_F(CameraHidlTest, constructDefaultRequestSettings) {
const camera_metadata_t* metadata =
(camera_metadata_t*) req.data();
size_t expectedSize = req.size();
ASSERT_EQ(0, validate_camera_metadata_structure(
metadata, &expectedSize));
int result = validate_camera_metadata_structure(
metadata, &expectedSize);
ASSERT_TRUE(result == 0 || result == CAMERA_METADATA_VALIDATION_SHIFTED);
size_t entryCount = get_camera_metadata_entry_count(metadata);
// TODO: we can do better than 0 here. Need to check how many required
// request keys we've defined for each template