| commit | ed6abddaf863eda997cf0a9208bd653d80c28689 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 18 16:31:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 18 16:31:22 2020 +0000 |
| tree | 5a8f463b3111b957d8ae7f39be04faf9eab4f26b | |
| parent | a1fade51b72e673581ba0cac3d16ed9f81164f98 [diff] | |
| parent | 83a6256f38db93b18dc494edf2d014a8e32aa425 [diff] |
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451 Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14
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) {