From 1b0bc8b35022f43fb6ef8ce4b35280bbf7af203d Mon Sep 17 00:00:00 2001
From: NukemZHYu <nukemzhyu@foxconn.corp-partner.google.com>
Date: Wed, 16 Sep 2020 17:10:49 +0800
Subject: [PATCH] camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device

change (getCameraDeviceVersion(mProviderType, name) to (getCameraDeviceVersion(name, mProviderType)
Avoid Camera HAL 1 Device fail on Status(EX_TRANSACTION_FAILED): 'BAD_TYPE:

Bug: 168676352
Test: run commandAndExit vts -m VtsHalCameraProviderV2_5Target

Change-Id: Icb164538bbc357e22412a7320bb721c220c24a4c
---
 .../2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 3e6c56e466..e0642e3005 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1516,7 +1516,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) {