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

Merge "Camera:Update condition to validate flash keys." into main

Browse source
This commit is contained in:
Treehugger Robot 2024-04-11 17:46:35 +00:00 committed by Android (Google) Code Review
commit f987ba014d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
camera/provider/aidl/vts/camera_aidl_test.cpp
View file

@ -1204,18 +1204,21 @@ void CameraAidlTest::verifyManualFlashStrengthControlCharacteristics(
int torchDefRetCode = find_camera_metadata_ro_entry(staticMeta,
ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL, &torchDefEntry);
if (torch_supported) {
int expectedEntryCount;
if(singleMaxRetCode == 0 && singleDefRetCode == 0 && torchMaxRetCode == 0 &&
torchDefRetCode == 0) {
singleMaxLevel = *singleMaxEntry.data.i32;
singleDefLevel = *singleDefEntry.data.i32;
torchMaxLevel = *torchMaxEntry.data.i32;
torchDefLevel = *torchDefEntry.data.i32;
ASSERT_TRUE((singleMaxEntry.count == singleDefEntry.count == torchMaxEntry.count
== torchDefEntry.count == 1));
expectedEntryCount = 1;
} else {
ASSERT_TRUE((singleMaxEntry.count == singleDefEntry.count == torchMaxEntry.count
== torchDefEntry.count == 0));
expectedEntryCount = 0;
}
ASSERT_EQ(singleMaxEntry.count, expectedEntryCount);
ASSERT_EQ(singleDefEntry.count, expectedEntryCount);
ASSERT_EQ(torchMaxEntry.count, expectedEntryCount);
ASSERT_EQ(torchDefEntry.count, expectedEntryCount);
// if the device supports this feature default levels should be greater than 0
if (singleMaxLevel > 1) {
ASSERT_GT(torchMaxLevel, 1);