From bf49b62d3611a37e8eac1cc7ceb1ba6f9f22ed63 Mon Sep 17 00:00:00 2001 From: Redkin Mikhail Date: Wed, 16 Jul 2025 16:19:37 +0300 Subject: [PATCH] Fix ani signatures Signed-off-by: Redkin Mikhail Change-Id: Ica228759101ff8f8ff6b068a6ffcbbb8877e56d1 --- .../driver_extension_ability/native/include/ani_utils.h | 8 ++++---- .../native/src/ani_driver_extension.cpp | 6 +++--- .../js/taihe/driver_extension_context/include/ani_utils.h | 8 ++++---- .../src/DriverExtensionContext.impl.cpp | 2 +- frameworks/js/taihe/src/ani_constructor.cpp | 2 +- .../js/taihe/src/ohos.driver.deviceManager.impl.cpp | 8 ++++---- 6 files changed, 17 insertions(+), 17 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 32f1e13..d005df6 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 @@ -186,25 +186,25 @@ private: template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Boolean;"); + return IsInstanceOf("std.core.Boolean"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Int;"); + return IsInstanceOf("std.core.Int"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Double;"); + return IsInstanceOf("std.core.Double"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/String;"); + return IsInstanceOf("std.core.String"); } template <> diff --git a/frameworks/js/ani/driver_extension_ability/native/src/ani_driver_extension.cpp b/frameworks/js/ani/driver_extension_ability/native/src/ani_driver_extension.cpp index f46b76d..6cbbf0c 100644 --- a/frameworks/js/ani/driver_extension_ability/native/src/ani_driver_extension.cpp +++ b/frameworks/js/ani/driver_extension_ability/native/src/ani_driver_extension.cpp @@ -23,7 +23,7 @@ #include "hilog_wrapper.h" #include "ets_native_reference.h" -constexpr const char* DRIVER_EXTENSION_CLS = "L@ohos/app/ability/DriverExtensionAbility/DriverExtensionAbility;"; +constexpr const char* DRIVER_EXTENSION_CLS = "@ohos.app.ability.DriverExtensionAbility.DriverExtensionAbility"; namespace OHOS { namespace AbilityRuntime { using namespace OHOS::AppExecFwk; @@ -260,7 +260,7 @@ ani_array_ref AniDriverExtension::ToAniStringList(ani_env *env, } ani_array_ref result = nullptr; ani_class stringCls = nullptr; - if (ANI_OK != env->FindClass("Lstd/core/String;", &stringCls)) { + if (ANI_OK != env->FindClass("std.core.String", &stringCls)) { HILOG_ERROR("FindClass Lstd/core/String Failed"); return result; } @@ -295,7 +295,7 @@ void AniDriverExtension::Dump(const std::vector ¶ms, std::vecto for (int i = 0; i < int(length); i++) { ani_ref stringEntryRef; if (ANI_OK != env->Object_CallMethodByName_Ref(static_cast(result), "$_get", - "I:Lstd/core/Object;", &stringEntryRef, (ani_int)i)) { + "i:C{std.core.Object}", &stringEntryRef, (ani_int)i)) { HILOG_ERROR("Object_CallMethodByName_Ref get Failed"); return; } 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 16fde2a..c82b938 100644 --- a/frameworks/js/taihe/driver_extension_context/include/ani_utils.h +++ b/frameworks/js/taihe/driver_extension_context/include/ani_utils.h @@ -187,25 +187,25 @@ private: template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Boolean;"); + return IsInstanceOf("C{std.core.Boolean}"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Int;"); + return IsInstanceOf("C{std.core.Int}"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Double;"); + return IsInstanceOf("C{std.core.Double}"); } template <> inline bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/String;"); + return IsInstanceOf("C{std.core.String}"); } template <> diff --git a/frameworks/js/taihe/driver_extension_context/src/DriverExtensionContext.impl.cpp b/frameworks/js/taihe/driver_extension_context/src/DriverExtensionContext.impl.cpp index a13fba8..66769cd 100644 --- a/frameworks/js/taihe/driver_extension_context/src/DriverExtensionContext.impl.cpp +++ b/frameworks/js/taihe/driver_extension_context/src/DriverExtensionContext.impl.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace AbilityRuntime { -constexpr const char *DRIVER_EXTENSION_CONTEXT_CLS = "Lapplication/DriverExtensionContext/DriverExtensionContext;"; +constexpr const char *DRIVER_EXTENSION_CONTEXT_CLS = "application.DriverExtensionContext.DriverExtensionContext"; void UpdateDriverState([[maybe_unused]] ani_env *env, [[maybe_unused]] ani_object object) { HILOG_DEBUG("UpdateDriverState begin"); diff --git a/frameworks/js/taihe/src/ani_constructor.cpp b/frameworks/js/taihe/src/ani_constructor.cpp index 405e0d3..1259247 100644 --- a/frameworks/js/taihe/src/ani_constructor.cpp +++ b/frameworks/js/taihe/src/ani_constructor.cpp @@ -31,7 +31,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_ERROR; } - static const char *namespaceName = "L@ohos/driver/deviceManager/deviceManager;"; + static const char *namespaceName = "C{@ohos.driver.deviceManager.deviceManager}"; ani_namespace ns; if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { EDM_LOGE(MODULE_DEV_MGR, "Not found '%{public}s'", namespaceName); diff --git a/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp b/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp index 38eb7a4..2d5c624 100644 --- a/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp +++ b/frameworks/js/taihe/src/ohos.driver.deviceManager.impl.cpp @@ -165,14 +165,14 @@ static ani_object ConvertToBusinessError(ani_env *env, const ErrMsg &errMsg) ani_object errorObject = nullptr; EDM_LOGD(MODULE_DEV_MGR, "Begin ThrowBusinessError."); - static const char *errorClsName = "L@ohos/base/BusinessError;"; + static const char *errorClsName = "@ohos.base.BusinessError"; ani_class cls {}; if (ANI_OK != env->FindClass(errorClsName, &cls)) { EDM_LOGE(MODULE_DEV_MGR, "find class BusinessError %{public}s failed", errorClsName); return errorObject; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", ":V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", ":", &ctor)) { EDM_LOGE(MODULE_DEV_MGR, "find method BusinessError.constructor failed"); return errorObject; } @@ -205,12 +205,12 @@ static ani_object ConvertToObjectDeviceId(ani_env *env, const uint64_t deviceId) ani_object retObject = nullptr; ani_long aniDeviceId = deviceId; ani_class cls {}; - if (ANI_OK != env->FindClass("Lstd/core/Long;", &cls)) { + if (ANI_OK != env->FindClass("std.core.Long", &cls)) { EDM_LOGE(MODULE_DEV_MGR, "find class Long Lstd/core/Long failed"); return retObject; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "D:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "d:", &ctor)) { EDM_LOGE(MODULE_DEV_MGR, "find method Long.constructor failed"); return retObject; } -- Gitee