From 47a887e2ab4d1c62bc762f47d350f6d0e0e1ce08 Mon Sep 17 00:00:00 2001 From: Redkin Mikhail Date: Wed, 2 Jul 2025 17:20:24 +0300 Subject: [PATCH] Fix ani signatures Signed-off-by: Redkin Mikhail Change-Id: I7b71327fa17720504cb835b6127dd3c353f09b8e --- frameworks/native/backup_ext/include/ani_utils.h | 8 ++++---- .../native/backup_ext/src/ext_backup_ani.cpp | 2 +- .../backup_ext/src/ext_backup_ani_error.cpp | 4 ++-- .../kits/ani/file_share/src/ani_file_share.cpp | 6 +++--- .../kits/ani/file_uri/src/ani_file_uri.cpp | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frameworks/native/backup_ext/include/ani_utils.h b/frameworks/native/backup_ext/include/ani_utils.h index 03cbc44f1..36cb9b253 100644 --- a/frameworks/native/backup_ext/include/ani_utils.h +++ b/frameworks/native/backup_ext/include/ani_utils.h @@ -192,25 +192,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/native/backup_ext/src/ext_backup_ani.cpp b/frameworks/native/backup_ext/src/ext_backup_ani.cpp index ad8d05307..03fb5de16 100644 --- a/frameworks/native/backup_ext/src/ext_backup_ani.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_ani.cpp @@ -107,7 +107,7 @@ ErrCode ExtBackupAni::CallEtsOnRestore() return EINVAL; } } - const std::string className = "L@ohos/application/BackupExtensionAbility/BundleVersionInner;"; + const std::string className = "C{@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/frameworks/native/backup_ext/src/ext_backup_ani_error.cpp b/frameworks/native/backup_ext/src/ext_backup_ani_error.cpp index bd72c18a9..e50a4e08c 100644 --- a/frameworks/native/backup_ext/src/ext_backup_ani_error.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_ani_error.cpp @@ -20,7 +20,7 @@ namespace OHOS { void AniError::ThrowBusinessError(ani_env *env, errorCode errCode, const std::string &errMsg) { - static const char *errorClsName = "L@ohos/base/BusinessError;"; + static const char *errorClsName = "C{@ohos.base.BusinessError}"; HILOGD("Begin ThrowBusinessError."); ani_class cls {}; @@ -30,7 +30,7 @@ void AniError::ThrowBusinessError(ani_env *env, errorCode errCode, const std::st } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", ":V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", ":", &ctor)) { HILOGE("find method BusinessError.constructor failed"); return; } diff --git a/interfaces/kits/ani/file_share/src/ani_file_share.cpp b/interfaces/kits/ani/file_share/src/ani_file_share.cpp index 2a12db932..65d4c5269 100644 --- a/interfaces/kits/ani/file_share/src/ani_file_share.cpp +++ b/interfaces/kits/ani/file_share/src/ani_file_share.cpp @@ -67,14 +67,14 @@ static ani_int ParseEnumToInt(ani_env *env, ani_enum_item enumItem) 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 = "C{@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; } @@ -300,7 +300,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_ERROR; } - static const char *nsName = "L@ohos/fileshare/fileShare;"; + static const char *nsName = "C{@ohos.fileshare.fileShare}"; ani_namespace ns; if (ANI_OK != env->FindNamespace(nsName, &ns)) { LOGE("Not found namespace %{public}s.", nsName); 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 8ba4067de..2ed610c45 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 = "C{@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; } @@ -131,7 +131,7 @@ void FileUriConstructor(ani_env *env, ani_object obj, ani_string stringObj) = new StdSharedPtrHolder(std::move(fileuriEntity)); ani_namespace ns; - if (env->FindNamespace("L@ohos/file/fileuri/fileUri;", &ns) != ANI_OK) { + if (env->FindNamespace("C{@ohos.file.fileuri.fileUri}", &ns) != ANI_OK) { LOGE("Namespace L@ohos/file/fileuri/fileUri not found."); ThrowBusinessError(env, EPERM, "Namespace L@ohos/file/fileuri/fileUri not found."); return; @@ -140,13 +140,13 @@ void FileUriConstructor(ani_env *env, ani_object obj, ani_string stringObj) ani_class cls; static const char *className = "LFileUri;"; if (env->Namespace_FindClass(ns, className, &cls) != ANI_OK) { - LOGE("Not found class LFileUri in Namespace L@ohos/file/fileuri/fileUri."); + LOGE("Not found class LFileUri in Namespace C{@ohos.file.fileuri.fileUri}"); ThrowBusinessError(env, EPERM, "Class LFileUri not found."); return; } 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."); ThrowBusinessError(env, EPERM, "Method acquireFileUriEntity not found."); return; @@ -168,7 +168,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_ERROR; } - static const char *nsName = "L@ohos/file/fileuri/fileUri;"; + static const char *nsName = "C{@ohos.file.fileuri.fileUri}"; ani_namespace ns; if (ANI_OK != env->FindNamespace(nsName, &ns)) { LOGE("Not found namespace %{public}s.", nsName); @@ -189,7 +189,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); @@ -197,7 +197,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("C{@ohos.file.fileuri.Cleaner}", &cleanerCls)) { LOGE("Not found class @ohos/file/fileuri/Cleaner;."); return ANI_NOT_FOUND; } -- Gitee