From 5140dd8834006eb7b28765720a689d2522c48f13 Mon Sep 17 00:00:00 2001 From: Rokashevich Svetlana Date: Fri, 18 Jul 2025 17:50:01 +0800 Subject: [PATCH] [ANI] Remove relative path search API Signed-off-by: Rokashevich Svetlana Change-Id: I2794ad8a29a76d347c0c5ff48988c182c681b6a5 --- .../native/include/ani_utils.h | 11 +++-------- .../driver_extension_context/include/ani_utils.h | 11 +++-------- .../js/taihe/src/ohos.driver.deviceManager.impl.cpp | 12 +++--------- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/frameworks/js/ani/driver_extension_ability/native/include/ani_utils.h b/frameworks/js/ani/driver_extension_ability/native/include/ani_utils.h index 76ce63e..32f1e13 100644 --- a/frameworks/js/ani/driver_extension_ability/native/include/ani_utils.h +++ b/frameworks/js/ani/driver_extension_ability/native/include/ani_utils.h @@ -33,15 +33,10 @@ public: { ani_object nullobj {}; - ani_namespace ns; - if (ANI_OK != env->FindNamespace(nsName, &ns)) { - HILOG_ERROR("[ANI] Not found namespace %{public}s", nsName); - return nullobj; - } - ani_class cls; - if (ANI_OK != env->Namespace_FindClass(ns, clsName, &cls)) { - HILOG_ERROR("[ANI] Not found class %{public}s", clsName); + const std::string fullClsName = std::string(nsName) + "." + clsName; + if (ANI_OK != env->FindClass(fullClsName.c_str(), &cls)) { + HILOG_ERROR("[ANI] Not found class %{public}s", fullClsName.c_str()); return nullobj; } diff --git a/frameworks/js/taihe/driver_extension_context/include/ani_utils.h b/frameworks/js/taihe/driver_extension_context/include/ani_utils.h index 03cbc44..16fde2a 100644 --- a/frameworks/js/taihe/driver_extension_context/include/ani_utils.h +++ b/frameworks/js/taihe/driver_extension_context/include/ani_utils.h @@ -33,15 +33,10 @@ public: { ani_object nullobj {}; - ani_namespace ns; - if (ANI_OK != env->FindNamespace(nsName, &ns)) { - std::cerr << "[ANI] Not found namespace " << nsName << std::endl; - return nullobj; - } - ani_class cls; - if (ANI_OK != env->Namespace_FindClass(ns, clsName, &cls)) { - std::cerr << "[ANI] Not found class " << clsName << std::endl; + const std::string fullClsName = std::string(nsName) + "." + clsName; + if (ANI_OK != env->FindClass(fullClsName.c_str(), &cls)) { + std::cerr << "[ANI] Not found class " << fullClsName << std::endl; return nullobj; } diff --git a/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp b/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp index 0ae457e..38eb7a4 100644 --- a/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp +++ b/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp @@ -120,16 +120,10 @@ static ani_object GetCallbackResult(ani_env *env, uint64_t deviceId, const sptr< } ani_object result {}; - static const char *namespaceName = "L@ohos/driver/deviceManager/deviceManager;"; - ani_namespace ns; - if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { - EDM_LOGE(MODULE_DEV_MGR, "Not found '%{public}s'", namespaceName); - return result; - } - ani_class cls; - if (ANI_OK != env->Namespace_FindClass(ns, "LRemoteDeviceDriver_inner;", &cls)) { - EDM_LOGE(MODULE_DEV_MGR, "FindClass \"LRemoteDeviceDriver_inner;\" failed"); + const char *clsName = "@ohos.driver.deviceManager.deviceManager.RemoteDeviceDriver_inner"; + if (ANI_OK != env->FindClass(clsName, &cls)) { + EDM_LOGE(MODULE_DEV_MGR, "FindClass '%{public}s' failed", clsName); return result; } -- Gitee