| commit | e19854ca4cde070a5e16dd4288817e57624bc216 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:22:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:22:48 2020 +0000 |
| tree | 4ad37887e756d153c3861bb6b001b8e459589470 | |
| parent | 83a6256f38db93b18dc494edf2d014a8e32aa425 [diff] | |
| parent | da6ac34b4c5afed58ec5f09f4d1fa06d61952a7f [diff] |
Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921 Change-Id: I1f7c50d9bf05fb576e5f7aaee02bfb14995db90a
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index f235235..f6f8a8e 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) {