From 9b61f3edca563b52ae08a8b9173d8371946f6b97 Mon Sep 17 00:00:00 2001
From: ypigunova <pigunova.yana@h-partners.com>
Date: Thu, 11 Sep 2025 17:32:28 +0300
Subject: [PATCH] [ANI]: Remove old mangling

Issue: ICXM56
Change-Id: I884c196ef878ddfd7fb349a1459e6235e0e224e0
Signed-off-by: ypigunova <pigunova.yana@h-partners.com>
---
 ani/settings/ani_settings.cpp          |  6 +++---
 ani/settings/ani_settings_observer.cpp | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ani/settings/ani_settings.cpp b/ani/settings/ani_settings.cpp
index c372cecc..2e1b3a18 100644
--- a/ani/settings/ani_settings.cpp
+++ b/ani/settings/ani_settings.cpp
@@ -45,14 +45,14 @@ const int UNSUPPORT_CODE = 801;
 
 void ThrowExistingError(ani_env *env, int errorCode, std::string errorMessage)
 {
-    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)) {
         SETTING_LOG_ERROR("find class BusinessError %{public}s failed", errorClsName);
         return;
     }
     ani_method ctor;
-    if (ANI_OK != env->Class_FindMethod(cls, "<ctor>", ":V", &ctor)) {
+    if (ANI_OK != env->Class_FindMethod(cls, "<ctor>", ":", &ctor)) {
         SETTING_LOG_ERROR("find method BusinessError.constructor failed");
         return;
     }
@@ -570,7 +570,7 @@ ani_boolean ani_register_key_observer(
 static ani_boolean BindMethods(ani_env *env)
 {
     using namespace OHOS::Settings;
-    const char *spaceName = "L@ohos/settings/settings;";
+    const char *spaceName = "@ohos.settings.settings";
     ani_namespace spc;
 
     ani_status ret = env->FindNamespace(spaceName, &spc);
diff --git a/ani/settings/ani_settings_observer.cpp b/ani/settings/ani_settings_observer.cpp
index 0c791f34..6e1c17c5 100644
--- a/ani/settings/ani_settings_observer.cpp
+++ b/ani/settings/ani_settings_observer.cpp
@@ -53,7 +53,7 @@ ani_object BoolToObject(ani_env *env, bool value)
 {
     ani_object aniObject = nullptr;
     ani_boolean boolValue = static_cast<bool>(value);
-    const char *className = "Lstd/core/Boolean;";
+    const char *className = "std.core.Boolean";
     ani_class aniClass;
     if (ANI_OK != env->FindClass(className, &aniClass)) {
         SETTING_LOG_ERROR("Not found '%{public}s.'", className);
@@ -61,7 +61,7 @@ ani_object BoolToObject(ani_env *env, bool value)
     }
 
     ani_method personInfoCtor;
-    if (ANI_OK != env->Class_FindMethod(aniClass, "<ctor>", "Z:V", &personInfoCtor)) {
+    if (ANI_OK != env->Class_FindMethod(aniClass, "<ctor>", "z:", &personInfoCtor)) {
         SETTING_LOG_ERROR("Class_GetMethod Failed '%{public}s' <ctor>.", className);
         return aniObject;
     }
@@ -96,11 +96,11 @@ ani_object CreateError(ani_env *env, const std::string &msg)
         return nullptr;
     }
 
-    if ((status = env->FindClass("Lescompat/Error;", &cls)) != ANI_OK) {
+    if ((status = env->FindClass("escompat.Error", &cls)) != ANI_OK) {
         SETTING_LOG_ERROR("FindClass failed %{public}d", status);
         return nullptr;
     }
-    if ((status = env->Class_FindMethod(cls, "<ctor>", "Lstd/core/String;Lescompat/ErrorOptions;:V", &method)) !=
+    if ((status = env->Class_FindMethod(cls, "<ctor>", "C{std.core.String}C{escompat.ErrorOptions}:", &method)) !=
         ANI_OK) {
         SETTING_LOG_ERROR("Class_FindMethod failed %{public}d", status);
         return nullptr;
@@ -123,11 +123,11 @@ ani_object CreateBusinessError(ani_env *env, int code, const std::string &msg)
         SETTING_LOG_ERROR("null env");
         return nullptr;
     }
-    if ((status = env->FindClass("L@ohos/base/BusinessError;", &cls)) != ANI_OK) {
+    if ((status = env->FindClass("@ohos.base.BusinessError", &cls)) != ANI_OK) {
         SETTING_LOG_ERROR("FindClass failed %{public}d", status);
         return nullptr;
     }
-    if ((status = env->Class_FindMethod(cls, "<ctor>", "ILescompat/Error;:V", &method)) != ANI_OK) {
+    if ((status = env->Class_FindMethod(cls, "<ctor>", "iC{escompat.Error}:", &method)) != ANI_OK) {
         SETTING_LOG_ERROR("Class_FindMethod failed %{public}d", status);
         return nullptr;
     }
-- 
Gitee