| commit | 12069ba3341d0e19f94acc32c1266f0fa84e0717 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 18 17:20:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 18 17:20:18 2020 +0000 |
| tree | dde92e3c04b0c4196eef02fc97164481551453c8 | |
| parent | 54b5003b09a08d27069c60e898c336def6c17acf [diff] | |
| parent | ed6abddaf863eda997cf0a9208bd653d80c28689 [diff] |
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
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index b0aae8e..44eccd3 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1670,7 +1670,7 @@ 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) {