From 78ab5dbe1d29fb68cdba88d9a533bd019c162ade Mon Sep 17 00:00:00 2001 From: ypigunova Date: Wed, 10 Sep 2025 19:57:31 +0300 Subject: [PATCH] [ANI]: Remove old mangling Issue: ICXEYQ Change-Id: Ia7dad9c7ff5bb2c4f5638c161417c16fda02200f Signed-off-by: ypigunova --- frameworks/ets/ani/src/manager/ani_manager.cpp | 12 ++++++------ frameworks/ets/ani/src/sts_common.cpp | 2 +- .../src/ohos.reminderAgentManager.impl.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frameworks/ets/ani/src/manager/ani_manager.cpp b/frameworks/ets/ani/src/manager/ani_manager.cpp index 0a7115d52..a83e3a173 100644 --- a/frameworks/ets/ani/src/manager/ani_manager.cpp +++ b/frameworks/ets/ani/src/manager/ani_manager.cpp @@ -78,7 +78,7 @@ static std::array kitManagerFunctions = { ani_native_function {"nativeGetAllActiveNotifications", nullptr, reinterpret_cast(AniGetAllActiveNotifications)}, ani_native_function {"nativeGetActiveNotifications", nullptr, reinterpret_cast(AniGetActiveNotifications)}, - ani_native_function {"nativeGetActiveNotificationCount", ":J", + ani_native_function {"nativeGetActiveNotificationCount", ":l", reinterpret_cast(AniGetActiveNotificationCount)}, ani_native_function {"nativeGetActiveNotificationByFilter", nullptr, reinterpret_cast(AniGetActiveNotificationByFilter)}, @@ -93,14 +93,14 @@ static std::array kitManagerFunctions = { reinterpret_cast(AniDisableNotificationFeature)}, ani_native_function {"nativesetTargetDeviceStatus", nullptr, reinterpret_cast(AniSetTargetDeviceStatus)}, ani_native_function {"nativeRequestEnableNotification", - "Lapplication/UIAbilityContext/UIAbilityContext;:Lstd/core/Promise;", + "C{application.UIAbilityContext.UIAbilityContext}:C{std.core.Promise}", reinterpret_cast(AniRequestEnableNotification)}, ani_native_function {"nativeGetNotificationSetting", nullptr, reinterpret_cast(AniGetNotificationSetting)}, #ifdef ANS_FEATURE_BADGE_MANAGER ani_native_function {"nativeDisplayBadge", nullptr, reinterpret_cast(AniDisplayBadge)}, ani_native_function {"nativeIsBadgeDisplayed", nullptr, reinterpret_cast(AniIsBadgeDisplayed)}, - ani_native_function {"nativeSetBadgeNumber", "I:V", reinterpret_cast(AniSetBadgeNumber)}, + ani_native_function {"nativeSetBadgeNumber", "i:", reinterpret_cast(AniSetBadgeNumber)}, ani_native_function {"nativeSetBadgeNumberByBundle", nullptr, reinterpret_cast(AniSetBadgeNumberByBundle)}, #else ani_native_function {"nativeDisplayBadge", nullptr, reinterpret_cast(ThrowSystemCapErr)}, @@ -197,9 +197,9 @@ static std::array kitManagerFunctions = { #ifdef ANS_FEATURE_LIVEVIEW_LOCAL_LIVEVIEW ani_native_function {"nativeOn", - "Lstd/core/String;Lstd/core/Function1;Lnotification/notificationRequest/NotificationCheckRequest;:I", + "C{std.core.String}C{std.core.Function1}C{notification.notificationRequest.NotificationCheckRequest}:i", reinterpret_cast(AniOn)}, - ani_native_function {"nativeOff", "Lstd/core/String;Lstd/core/Function1;:I", reinterpret_cast(AniOff)}, + ani_native_function {"nativeOff", "C{std.core.String}C{std.core.Function1}:i", reinterpret_cast(AniOff)}, ani_native_function {"nativeSubscribeSystemLiveView", nullptr, reinterpret_cast(AniSubscribeSystemLiveView)}, ani_native_function {"nativeTriggerSystemLiveView", nullptr, reinterpret_cast(AniTriggerSystemLiveView)}, @@ -218,7 +218,7 @@ static std::array kitManagerFunctions = { #ifdef ANS_FEATURE_OPEN_NOTIFICATION_SETTINGS ani_native_function {"nativeOpenNotificationSettings", - "Lapplication/UIAbilityContext/UIAbilityContext;:Lstd/core/Promise;", + "C{application.UIAbilityContext.UIAbilityContext}:C{std.core.Promise}", reinterpret_cast(AniOpenNotificationSettings)}, #else ani_native_function {"nativeOpenNotificationSettings", nullptr, reinterpret_cast(ThrowSystemCapErr)}, diff --git a/frameworks/ets/ani/src/sts_common.cpp b/frameworks/ets/ani/src/sts_common.cpp index bab76c951..645238a0b 100644 --- a/frameworks/ets/ani/src/sts_common.cpp +++ b/frameworks/ets/ani/src/sts_common.cpp @@ -359,7 +359,7 @@ ani_status GetPropertyEnumItemArray(ani_env *env, ani_object param, const char * for (int i = 0; i < static_cast(length); i++) { ani_ref enumItemRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &enumItemRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &enumItemRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("status: %{public}d, index: %{public}d", status, i); return status; diff --git a/frameworks/reminder_ani/src/ohos.reminderAgentManager.impl.cpp b/frameworks/reminder_ani/src/ohos.reminderAgentManager.impl.cpp index 0e6d5bc49..2c62f28cb 100644 --- a/frameworks/reminder_ani/src/ohos.reminderAgentManager.impl.cpp +++ b/frameworks/reminder_ani/src/ohos.reminderAgentManager.impl.cpp @@ -45,7 +45,7 @@ static bool UnWarpDate(uintptr_t date, ani_double& outValue) ANSR_LOGE("Env is nullptr."); return false; } - static const char* className = "Lescompat/Date;"; + static const char* className = "escompat.Date"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { ANSR_LOGE("Failed to find class %{public}s.", className); @@ -71,7 +71,7 @@ static bool UnWarpNotificationSlot(uintptr_t slot, OHOS::Notification::Notificat ANSR_LOGE("Env is nullptr or slot is nullptr."); return false; } - static const char* className = "Lnotification/notificationSlot/NotificationSlotInner;"; + static const char* className = "notification.notificationSlot.NotificationSlotInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { ANSR_LOGE("Failed to find class %{public}s.", className); @@ -118,8 +118,8 @@ static bool WarpDate(int64_t time, ani_object &outObj) return false; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", ":V", &ctor)) != ANI_OK) { - ANSR_LOGE("Failed to find method . :V."); + if ((status = env->Class_FindMethod(cls, "", ":", &ctor)) != ANI_OK) { + ANSR_LOGE("Failed to find method . :."); return false; } if ((status = env->Object_New(cls, ctor, &outObj)) != ANI_OK) { @@ -127,7 +127,7 @@ static bool WarpDate(int64_t time, ani_object &outObj) return false; } ani_double msObj = 0; - if ((status = env->Object_CallMethodByName_Double(outObj, "setTime", "D:D", &msObj, static_cast(time))) + if ((status = env->Object_CallMethodByName_Double(outObj, "setTime", "d:d", &msObj, static_cast(time))) != ANI_OK) { ANSR_LOGE("Object_CallMethodByName_Double setDate faild."); return false; -- Gitee