From be3bbc4dde079f100b734e25db398798b3cab189 Mon Sep 17 00:00:00 2001 From: Denis Slynko Date: Sat, 13 Sep 2025 10:27:59 +0300 Subject: [PATCH] [ANI] Remove deprecated mangling Issue: #ICXU4H Change-Id: I4409fddfc8c5fabb36bd8d9c52a1d3732d2b7be9 Signed-off-by: Denis Slynko --- .../src/ani_accessibility_config.cpp | 4 +-- .../src/ani_accessibility_element.cpp | 2 +- .../src/ani_accessibility_extension.cpp | 6 ++--- interfaces/kits/ani/src/ani_utils.cpp | 26 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/interfaces/kits/ani/accessibility_config/src/ani_accessibility_config.cpp b/interfaces/kits/ani/accessibility_config/src/ani_accessibility_config.cpp index 9edc8df1..93f0cdf7 100644 --- a/interfaces/kits/ani/accessibility_config/src/ani_accessibility_config.cpp +++ b/interfaces/kits/ani/accessibility_config/src/ani_accessibility_config.cpp @@ -913,7 +913,7 @@ bool ANIAccessibilityConfig::GetColorMember(ani_env *env, ani_object object, con return false; } ani_class stringClass; - env->FindClass("Lstd/core/String;", &stringClass); + env->FindClass("std.core.String", &stringClass); ani_boolean isString; env->Object_InstanceOf(static_cast(ref), stringClass, &isString); if (isString) { @@ -922,7 +922,7 @@ bool ANIAccessibilityConfig::GetColorMember(ani_env *env, ani_object object, con HILOG_INFO("color stringContent = %{public}s, color = %{public}u", stringContent.c_str(), color); } else { ani_int valueInt; - if (ANI_OK != env->Object_CallMethodByName_Int(static_cast(ref), "unboxed", ":I", &valueInt)) { + if (ANI_OK != env->Object_CallMethodByName_Int(static_cast(ref), "unboxed", ":i", &valueInt)) { HILOG_ERROR(" Unboxed Int failed"); return false; } diff --git a/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_element.cpp b/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_element.cpp index a350a6f9..10ae6ba4 100755 --- a/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_element.cpp +++ b/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_element.cpp @@ -67,7 +67,7 @@ bool InitializeAccessibilityElementClass(ani_env *env) return false; } std::array cleanMethod = { - ani_native_function {"cleanNative", ":V", reinterpret_cast(Clean)}, + ani_native_function {"cleanNative", ":", reinterpret_cast(Clean)}, }; if (ANI_OK != env->Class_BindNativeMethods(cleanerCls, cleanMethod.data(), cleanMethod.size())) { HILOG_ERROR("Cannot bind native methods to AccessibilityElementCleaner"); diff --git a/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_extension.cpp b/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_extension.cpp index c8a870fb..cc608755 100755 --- a/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_extension.cpp +++ b/interfaces/kits/ani/accessibility_extension_module/src/ani_accessibility_extension.cpp @@ -213,7 +213,7 @@ void AniAccessibilityExtension::onAccessibilityConnect(ani_env *env, ani_object HILOG_ERROR("class not found"); return ; } - if (ANI_OK != env->Class_FindMethod(cls, "onAccessibilityConnect", ":V", &managedMethod)) { + if (ANI_OK != env->Class_FindMethod(cls, "onAccessibilityConnect", ":", &managedMethod)) { HILOG_ERROR("Class_FindMethod Failed"); return ; } @@ -271,7 +271,7 @@ void AniAccessibilityExtension::onAccessibilityDisconnect(ani_env *env, ani_obje HILOG_ERROR("OnAccessibilityDisconnect FindClass err: accessibility extension"); return; } - if (ANI_OK != env->Class_FindMethod(cls, "onAccessibilityDisconnect", ":V", &managedMethod)) { + if (ANI_OK != env->Class_FindMethod(cls, "onAccessibilityDisconnect", ":", &managedMethod)) { HILOG_ERROR("Class_FindMethod Failed"); return ; } @@ -604,7 +604,7 @@ void CreateJsAccessibilityAbilityEventInfoInner(ani_env *env, do { constexpr const char* eventTypeCls = - "L@ohos/accessibility/AccessibilityEventType;"; + "@ohos.accessibility.AccessibilityEventType"; if (!ANIUtils::SetEnumProperty(env, object, eventTypeCls, "eventType", callbackInfo->AccessibilityEventType_)) { HILOG_ERROR("Failed to set eventType"); diff --git a/interfaces/kits/ani/src/ani_utils.cpp b/interfaces/kits/ani/src/ani_utils.cpp index 9bb4a99d..e25c5562 100755 --- a/interfaces/kits/ani/src/ani_utils.cpp +++ b/interfaces/kits/ani/src/ani_utils.cpp @@ -26,7 +26,7 @@ using namespace OHOS::Accessibility; using namespace arkts::ani_signature; -constexpr const char* CLASSNAME_DOUBLE = "Lstd/core/Double;"; +constexpr const char* CLASSNAME_DOUBLE = "std.core.Double"; const std::string HALF_VALUE = "0"; const std::string FULL_VALUE = "1"; @@ -785,7 +785,7 @@ bool ANIUtils::GetNumberMember(ani_env *env, ani_object options, const std::stri } ani_double valueDouble; - if (ANI_OK != env->Object_CallMethodByName_Double(static_cast(ref), "unboxed", ":D", &valueDouble)) { + if (ANI_OK != env->Object_CallMethodByName_Double(static_cast(ref), "unboxed", ":", &valueDouble)) { HILOG_ERROR(" Unboxed Double failed"); return false; } @@ -796,7 +796,7 @@ bool ANIUtils::GetNumberMember(ani_env *env, ani_object options, const std::stri bool ANIUtils::SetNumberMember(ani_env *env, ani_object obj, const std::string &name, const ani_int value) { - static const char *className = "Lstd/core/Int;"; + static const char *className = "std.core.Int"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { HILOG_ERROR(" Find class '%{public}s' failed", className); @@ -804,7 +804,7 @@ bool ANIUtils::SetNumberMember(ani_env *env, ani_object obj, const std::string & } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "I:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "i:", &ctor)) { HILOG_ERROR(" Find method '' failed"); return false; } @@ -836,7 +836,7 @@ ani_object ANIUtils::CreateDouble(ani_env *env, int32_t value) return nullptr; } ani_method doubleCtor; - if ((status = env->Class_FindMethod(doubleCls, "", "D:V", &doubleCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(doubleCls, "", "d:", &doubleCtor)) != ANI_OK) { HILOG_ERROR(" status : %{public}d", status); return nullptr; } @@ -852,12 +852,12 @@ ani_status ANIUtils::CreateAniBoolean(ani_env* env, bool value, ani_object& resu { ani_status state; ani_class booleanClass; - if ((state = env->FindClass("Lstd/core/Boolean;", &booleanClass)) != ANI_OK) { + if ((state = env->FindClass("std.core.Boolean", &booleanClass)) != ANI_OK) { HILOG_ERROR("FindClass std/core/Boolean failed, %{public}d", state); return state; } ani_method booleanClassCtor; - if ((state = env->Class_FindMethod(booleanClass, "", "Z:V", &booleanClassCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(booleanClass, "", "z:", &booleanClassCtor)) != ANI_OK) { HILOG_ERROR("Class_FindMethod Boolean ctor failed, %{public}d", state); return state; } @@ -873,12 +873,12 @@ ani_status ANIUtils::CreateAniInt(ani_env* env, int32_t value, ani_object& resul { ani_status state; ani_class intClass; - if ((state = env->FindClass("Lstd/core/Int;", &intClass)) != ANI_OK) { + if ((state = env->FindClass("std.core.Int", &intClass)) != ANI_OK) { HILOG_ERROR("FindClass std/core/Int failed, %{public}d", state); return state; } ani_method intClassCtor; - if ((state = env->Class_FindMethod(intClass, "", "I:V", &intClassCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(intClass, "", "i:", &intClassCtor)) != ANI_OK) { HILOG_ERROR("Class_FindMethod Int ctor failed, %{public}d", state); return state; } @@ -893,12 +893,12 @@ ani_status ANIUtils::CreateAniFloat(ani_env* env, float value, ani_object& resul { ani_status state; ani_class floatClass; - if ((state = env->FindClass("Lstd/core/Float;", &floatClass)) != ANI_OK) { + if ((state = env->FindClass("std.core.Float", &floatClass)) != ANI_OK) { HILOG_ERROR("FindClass std/core/Float failed, %{public}d", state); return state; } ani_method floatClassCtor; - if ((state = env->Class_FindMethod(floatClass, "", "F:V", &floatClassCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(floatClass, "", "f:", &floatClassCtor)) != ANI_OK) { HILOG_ERROR("Class_FindMethod Float ctor failed, %{public}d", state); return state; } @@ -913,12 +913,12 @@ ani_status ANIUtils::CreateAniLong(ani_env* env, int64_t value, ani_object& resu { ani_status state; ani_class longClass; - if ((state = env->FindClass("Lstd/core/Long;", &longClass)) != ANI_OK) { + if ((state = env->FindClass("std.core.Long", &longClass)) != ANI_OK) { HILOG_ERROR("FindClass std/core/Long failed, %{public}d", state); return state; } ani_method longClassCtor; - if ((state = env->Class_FindMethod(longClass, "", "J:V", &longClassCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(longClass, "", "l:", &longClassCtor)) != ANI_OK) { HILOG_ERROR("Class_FindMethod Long ctor failed, %{public}d", state); return state; } -- Gitee