From d0bea17c9abcd4c3d1ed438eeb0e97f9180d7c5d Mon Sep 17 00:00:00 2001 From: Redkin Mikhail Date: Thu, 7 Aug 2025 17:27:31 +0300 Subject: [PATCH] Fix ani signatures 2 Signed-off-by: Redkin Mikhail Change-Id: I49302703a6591deb66a259056c7fca789610494e --- .../certificate_manager_ani/src/cm_ani.cpp | 2 +- .../src/cm_dialog_ani.cpp | 2 +- .../cm_ani_common/utils/src/cm_ani_utils.cpp | 28 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/interfaces/kits/ani/certificate_manager_ani/src/cm_ani.cpp b/interfaces/kits/ani/certificate_manager_ani/src/cm_ani.cpp index 7fd9d96..3afdc8d 100644 --- a/interfaces/kits/ani/certificate_manager_ani/src/cm_ani.cpp +++ b/interfaces/kits/ani/certificate_manager_ani/src/cm_ani.cpp @@ -219,7 +219,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ret; } ani_module module; - ret = env->FindModule("L@ohos/security/certManager;", &module); + ret = env->FindModule("@ohos.security.certManager", &module); if (ret != ANI_OK) { CM_LOG_E("FindModule failed, ret = %d", static_cast(ret)); return ret; diff --git a/interfaces/kits/ani/certificate_manager_dialog_ani/src/cm_dialog_ani.cpp b/interfaces/kits/ani/certificate_manager_dialog_ani/src/cm_dialog_ani.cpp index a919156..8b57cfd 100644 --- a/interfaces/kits/ani/certificate_manager_dialog_ani/src/cm_dialog_ani.cpp +++ b/interfaces/kits/ani/certificate_manager_dialog_ani/src/cm_dialog_ani.cpp @@ -71,7 +71,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ret; } ani_module module; - ret = env->FindModule("L@ohos/security/certManagerDialog;", &module); + ret = env->FindModule("@ohos.security.certManagerDialog", &module); if (ret != ANI_OK) { CM_LOG_E("FindModule failed, ret = %d", static_cast(ret)); return ret; diff --git a/interfaces/kits/ani/cm_ani_common/utils/src/cm_ani_utils.cpp b/interfaces/kits/ani/cm_ani_common/utils/src/cm_ani_utils.cpp index a19fba1..2ee85b9 100644 --- a/interfaces/kits/ani/cm_ani_common/utils/src/cm_ani_utils.cpp +++ b/interfaces/kits/ani/cm_ani_common/utils/src/cm_ani_utils.cpp @@ -24,19 +24,19 @@ namespace OHOS::Security::CertManager::Ani { namespace AniUtils { const char *ETS_CTOR = ""; -const char *NATIVE_RESULT_CLASS = "L@ohos/security/certManager/NativeResult;"; -const char *CALLBACK_WRAPPER_CLASS = "L@ohos/security/certManagerDialog/AsyncCallbackWrapper;"; -const char *BUSINESS_ERROR_CLASS = "L@ohos/base/BusinessError;"; -const char *CM_RESULT_CLASS = "L@ohos/security/certManager/CMResultClass;"; -const char *CRED_ABSTRACT_CLASS = "L@ohos/security/certManager/CredentialAbstractClass;"; -const char *CREDENTIAL_CLASS = "L@ohos/security/certManager/CredentialClass;"; -const char *CERT_ABSTRACT_CLASS = "L@ohos/security/certManager/CertAbstractClass;"; -const char *CERT_INFO_CLASS = "L@ohos/security/certManager/CertInfoClass;"; -const char *UINT8_ARRAY_CLASS = "Lescompat/Uint8Array;"; -const char *KEY_PURPOSE_ENUM = "L@ohos/security/certManager/certificateManager/CmKeyPurpose;"; -const char *KEY_PADDING_ENUM = "L@ohos/security/certManager/certificateManager/CmKeyPadding;"; -const char *KEY_DIGEST_ENUM = "L@ohos/security/certManager/certificateManager/CmKeyDigest;"; -const char *CM_HANDLE_CLASS = "L@ohos/security/certManager/CMHandleClass;"; +const char *NATIVE_RESULT_CLASS = "@ohos.security.certManager.NativeResult"; +const char *CALLBACK_WRAPPER_CLASS = "@ohos.security.certManagerDialog.AsyncCallbackWrapper"; +const char *BUSINESS_ERROR_CLASS = "@ohos.base.BusinessError"; +const char *CM_RESULT_CLASS = "@ohos.security.certManager.CMResultClass"; +const char *CRED_ABSTRACT_CLASS = "@ohos.security.certManager.CredentialAbstractClass"; +const char *CREDENTIAL_CLASS = "@ohos.security.certManager.CredentialClass"; +const char *CERT_ABSTRACT_CLASS = "@ohos.security.certManager.CertAbstractClass"; +const char *CERT_INFO_CLASS = "@ohos.security.certManager.CertInfoClass"; +const char *UINT8_ARRAY_CLASS = "escompat.Uint8Array"; +const char *KEY_PURPOSE_ENUM = "@ohos.security.certManager.certificateManager.CmKeyPurpose"; +const char *KEY_PADDING_ENUM = "@ohos.security.certManager.certificateManager.CmKeyPadding"; +const char *KEY_DIGEST_ENUM = "@ohos.security.certManager.certificateManager.CmKeyDigest"; +const char *CM_HANDLE_CLASS = "@ohos.security.certManager.CMHandleClass"; const char *BOOLEAN_CLASS = "std.core.Boolean"; bool IsUndefined(ani_env *env, ani_object object) @@ -320,7 +320,7 @@ int32_t GenerateUint8Array(ani_env *env, const CmBlob *data, ani_object &resultO } ani_method ctor; - if (env->Class_FindMethod(uint8ArrayClass, ETS_CTOR, "I:V", &ctor) != ANI_OK) { + if (env->Class_FindMethod(uint8ArrayClass, ETS_CTOR, "i:", &ctor) != ANI_OK) { CM_LOG_E("find class method failed, method %s not found.", ETS_CTOR); return CMR_ERROR_INVALID_ARGUMENT; } -- Gitee