Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

camera vts: Skip regular vts tests for secure only cameras.

Browse Source 
Bug: 156749607

Test: fake mark a camera id as a secure only, see that it doesn't get
      tested unless a test calls getCameraDeviceNames with addSecure = true

Test: VtsHalCameraProviderV2_4TargetTest passes on device without any secure only
      cameras

Change-Id: Ibe428b663bd8024f46f0273ed5dfaa108a90dd43
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
This commit is contained in:
Jayant Chowdhary
2020-05-14 21:02:41 -07:00
parent 74b04e9649
commit 83b724a23f
1 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View File

@@ -575,7 +575,10 @@ public:
}
virtual void TearDown() override {}
hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider);
hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider,
bool addSecureOnly = false);
bool isSecureOnly(sp<ICameraProvider> provider, const hidl_string& name);
std::map<hidl_string, hidl_string> getCameraDeviceIdToNameMap(sp<ICameraProvider> provider);
@@ -1585,7 +1588,8 @@ std::map<hidl_string, hidl_string> CameraHidlTest::getCameraDeviceIdToNameMap(
return idToNameMap;
}
hidl_vec<hidl_string> CameraHidlTest::getCameraDeviceNames(sp<ICameraProvider> provider) {
hidl_vec<hidl_string> CameraHidlTest::getCameraDeviceNames(sp<ICameraProvider> provider,
bool addSecureOnly) {
std::vector<std::string> cameraDeviceNames;
Return<void> ret;
ret = provider->getCameraIdList(
@@ -1634,11 +1638,51 @@ hidl_vec<hidl_string> CameraHidlTest::getCameraDeviceNames(sp<ICameraProvider> p
}
}
hidl_vec<hidl_string> retList(cameraDeviceNames.size());
std::vector<hidl_string> retList;
for (size_t i = 0; i < cameraDeviceNames.size(); i++) {
retList[i] = cameraDeviceNames[i];
bool isSecureOnlyCamera = isSecureOnly(mProvider, cameraDeviceNames[i]);
if (addSecureOnly) {
if (isSecureOnlyCamera) {
retList.emplace_back(cameraDeviceNames[i]);
}
} else if (!isSecureOnlyCamera) {
retList.emplace_back(cameraDeviceNames[i]);
}
}
return retList;
hidl_vec<hidl_string> finalRetList = std::move(retList);
return finalRetList;
}
bool CameraHidlTest::isSecureOnly(sp<ICameraProvider> provider, const hidl_string& name) {
Return<void> ret;
::android::sp<ICameraDevice> device3_x;
bool retVal = false;
if (getCameraDeviceVersion(mProviderType, name) == CAMERA_DEVICE_API_VERSION_1_0) {
return false;
}
ret = provider->getCameraDeviceInterface_V3_x(name, [&](auto status, const auto& device) {
ALOGI("getCameraDeviceInterface_V3_x returns status:%d", (int)status);
ASSERT_EQ(Status::OK, status);
ASSERT_NE(device, nullptr);
device3_x = device;
});
if (!ret.isOk()) {
ADD_FAILURE() << "Failed to get camera device interface for " << name;
}
ret = device3_x->getCameraCharacteristics([&](Status s, CameraMetadata metadata) {
ASSERT_EQ(Status::OK, s);
camera_metadata_t* chars = (camera_metadata_t*)metadata.data();
SystemCameraKind systemCameraKind = SystemCameraKind::PUBLIC;
Status status = getSystemCameraKind(chars, &systemCameraKind);
ASSERT_EQ(status, Status::OK);
if (systemCameraKind == SystemCameraKind::HIDDEN_SECURE_CAMERA) {
retVal = true;
}
});
if (!ret.isOk()) {
ADD_FAILURE() << "Failed to get camera characteristics for device " << name;
}
return retVal;
}
hidl_vec<hidl_vec<hidl_string>> CameraHidlTest::getConcurrentDeviceCombinations(