From 4565ab90c9812a976d2b8e3a77b23e4efb073a6f Mon Sep 17 00:00:00 2001 From: Redkin Mikhail Date: Tue, 15 Jul 2025 19:04:40 +0300 Subject: [PATCH] Fix ani signatures Signed-off-by: Redkin Mikhail Change-Id: I4b973c56bcb7b0686614e23d88765fd086cbe677 --- frameworks/native/backup_ext/include/ani_utils.h | 8 ++++---- frameworks/native/backup_ext/src/ext_backup_ani.cpp | 2 +- interfaces/kits/ani/file_uri/src/ani_file_uri.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/native/backup_ext/include/ani_utils.h b/frameworks/native/backup_ext/include/ani_utils.h index a69d9f097..00786ba84 100644 --- a/frameworks/native/backup_ext/include/ani_utils.h +++ b/frameworks/native/backup_ext/include/ani_utils.h @@ -200,25 +200,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/native/backup_ext/src/ext_backup_ani.cpp b/frameworks/native/backup_ext/src/ext_backup_ani.cpp index ffb67e5a4..8645a1369 100644 --- a/frameworks/native/backup_ext/src/ext_backup_ani.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_ani.cpp @@ -113,7 +113,7 @@ ErrCode ExtBackupAni::CallEtsOnRestore() return EINVAL; } } - const std::string className = "L@ohos/application/BackupExtensionAbility/BundleVersionInner;"; + const std::string className = "@ohos.application.BackupExtensionAbility.BundleVersionInner"; ani_object bundleVersionObj = AniObjectUtils::Create(env, className.c_str()); if (nullptr == bundleVersionObj) { HILOGE("Failed to Create the BundleVersionInner"); diff --git a/interfaces/kits/ani/file_uri/src/ani_file_uri.cpp b/interfaces/kits/ani/file_uri/src/ani_file_uri.cpp index ba3399ad9..e256caa08 100644 --- a/interfaces/kits/ani/file_uri/src/ani_file_uri.cpp +++ b/interfaces/kits/ani/file_uri/src/ani_file_uri.cpp @@ -58,14 +58,14 @@ static ModuleFileUri::FileUriEntity *unwrapp(ani_env *env, ani_object object) static void ThrowBusinessError(ani_env *env, int errCode, std::string &&errMsg) { LOGD("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)) { LOGE("find class BusinessError %{public}s failed", errorClsName); return; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", ":V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", ":", &ctor)) { LOGE("find method BusinessError.constructor failed"); return; } @@ -147,7 +147,7 @@ static void FileUriConstructor(ani_env *env, ani_object obj, ani_string stringOb } ani_method acquireObj; - if (ANI_OK != env->Class_FindMethod(cls, "acquireFileUriEntity", "J:V", &acquireObj)) { + if (ANI_OK != env->Class_FindMethod(cls, "acquireFileUriEntity", "l:", &acquireObj)) { LOGE("Not found method acquireFileUriEntity in class LFileUri."); delete holder; ThrowBusinessError(env, EPERM, "Method acquireFileUriEntity not found."); @@ -193,7 +193,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_NOT_FOUND; } std::array classMethods = { - ani_native_function {"", "Lstd/core/String;:V", reinterpret_cast(FileUriConstructor)}, + ani_native_function {"", "C{std.core.String}:", reinterpret_cast(FileUriConstructor)}, }; if (ANI_OK != env->Class_BindNativeMethods(fileUriClass, classMethods.data(), classMethods.size())) { LOGE("Cannot bind native methods to class %{public}s.", className); @@ -201,7 +201,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) }; ani_class cleanerCls; - if (ANI_OK != env->FindClass("L@ohos/file/fileuri/Cleaner;", &cleanerCls)) { + if (ANI_OK != env->FindClass("@ohos.file.fileuri.Cleaner", &cleanerCls)) { LOGE("Not found class @ohos/file/fileuri/Cleaner;."); return ANI_NOT_FOUND; } -- Gitee