Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38 am: ed6abddaf8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451

Change-Id: I884143be08a9ac914836d896597ba6db63fdf8d9
This commit is contained in:
Treehugger Robot
2020-09-18 17:20:18 +00:00
committed by Automerger Merge Worker

View File

@@ -1670,7 +1670,7 @@ bool CameraHidlTest::isSecureOnly(sp<ICameraProvider> provider, const hidl_strin
Return<void> ret;
::android::sp<ICameraDevice> device3_x;
bool retVal = false;
if (getCameraDeviceVersion(mProviderType, name) == CAMERA_DEVICE_API_VERSION_1_0) {
if (getCameraDeviceVersion(name, mProviderType) == CAMERA_DEVICE_API_VERSION_1_0) {
return false;
}
ret = provider->getCameraDeviceInterface_V3_x(name, [&](auto status, const auto& device) {