diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 1d73ec51d3f4dfbfade2bdd75a7f3709aa3357a3..897e672b9ed2021d3b52dc3d9baf47f074c30cbd 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -181,7 +181,7 @@ static ani_object CreateAtManager([[maybe_unused]] ani_env* env) return atManagerObj; } - static const char* className = "L@ohos/abilityAccessCtrl/abilityAccessCtrl/AtManagerInner;"; + static const char* className = "C{@ohos.abilityAccessCtrl.abilityAccessCtrl.AtManagerInner}"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", className); @@ -816,7 +816,7 @@ void InitAbilityCtrlFunction(ani_env *env) ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr env"); return; } - const char* spaceName = "L@ohos/abilityAccessCtrl/abilityAccessCtrl;"; + const char* spaceName = "C{@ohos.abilityAccessCtrl.abilityAccessCtrl}"; ani_namespace spc; if (ANI_OK != env->FindNamespace(spaceName, &spc)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", spaceName); @@ -829,7 +829,7 @@ void InitAbilityCtrlFunction(ani_env *env) ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind native methods to %{public}s", spaceName); return; }; - const char* className = "L@ohos/abilityAccessCtrl/abilityAccessCtrl/AtManagerInner;"; + const char* className = "C{@ohos.abilityAccessCtrl.abilityAccessCtrl.AtManagerInner}"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", className); diff --git a/frameworks/ets/ani/accesstoken/src/ani_common.cpp b/frameworks/ets/ani/accesstoken/src/ani_common.cpp index 33de4a56bc8d3d9936d15b01cce15f174118e0a7..ffa0671a3bc8b9816cf963a8ff7474edcaa4f315 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_common.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_common.cpp @@ -20,7 +20,7 @@ namespace Security { namespace AccessToken { namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniAccessTokenCommon" }; -constexpr const char* WRAPPER_CLASS_NAME = "L@ohos/abilityAccessCtrl/AsyncCallbackWrapper;"; +constexpr const char* WRAPPER_CLASS_NAME = "C{@ohos.abilityAccessCtrl.AsyncCallbackWrapper}"; constexpr const char* INVOKE_METHOD_NAME = "invoke"; } // namespace @@ -39,7 +39,7 @@ bool ExecuteAsyncCallback(ani_env* env, ani_object callback, ani_object error, a } ani_method method = {}; if ((status = env->Class_FindMethod( - clsCall, INVOKE_METHOD_NAME, "L@ohos/base/BusinessError;Lstd/core/Object;:V", &method)) != ANI_OK) { + clsCall, INVOKE_METHOD_NAME, "C{@ohos.base.BusinessError}C{std.core.Object}:", &method)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod failed, error=%{public}d.", static_cast(status)); return false; } diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp index ca7cac971724be55c897b3652b8659302555e263..61f3ab350fee52afbe50e7813dd0d0a21bb100b3 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp @@ -91,7 +91,7 @@ static ani_object WrapResult(ani_env* env, std::shared_ptr& { ani_status status = ANI_ERROR; ani_class cls = nullptr; - if ((status = env->FindClass("Lsecurity/PermissionRequestResult/PermissionRequestResult;", &cls)) != ANI_OK) { + if ((status = env->FindClass("C{security.PermissionRequestResult.PermissionRequestResult}", &cls)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass status %{public}d ", static_cast(status)); return nullptr; } diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp index 3d8dc482e85454333f582f147871cb5cb5b1b22f..c1cef14f20ec130b79927f0b5023f14d0ce4afd4 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp @@ -132,13 +132,13 @@ static void StateToEnumIndex(int32_t state, ani_size& enumIndex) static ani_object ReturnResult(ani_env* env, std::shared_ptr& asyncContext) { ani_class arrayCls = nullptr; - if (env->FindClass("Lescompat/Array;", &arrayCls) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass name Lescompat/Array failed!"); + if (env->FindClass("C{escompat.Array}", &arrayCls) != ANI_OK) { + ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass name C{escompat.Array} failed!"); return nullptr; } ani_method arrayCtor; - if (env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor) != ANI_OK) { + if (env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass failed!"); return nullptr; } @@ -149,7 +149,7 @@ static ani_object ReturnResult(ani_env* env, std::shared_ptrFindEnum(enumDescriptor, &enumType) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass name %{public}s failed!", enumDescriptor); @@ -166,7 +166,7 @@ static ani_object ReturnResult(ani_env* env, std::shared_ptrObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, enumItem) != ANI_OK) { + if (env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, enumItem) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Object_CallMethodByName_Void $_set failed!"); break; } diff --git a/frameworks/ets/ani/common/src/ani_error.cpp b/frameworks/ets/ani/common/src/ani_error.cpp index 23b9b9719d7153e93f0a2bc840385489f0a9e09e..89b7dc0078200c599e6c70fdeed24c90b2b0c4cb 100644 --- a/frameworks/ets/ani/common/src/ani_error.cpp +++ b/frameworks/ets/ani/common/src/ani_error.cpp @@ -26,7 +26,7 @@ namespace AccessToken { namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_PRIVACY, "CommonAni" }; } // namespace -constexpr const char* BUSINESS_ERROR_CLASS = "L@ohos/base/BusinessError;"; +constexpr const char* BUSINESS_ERROR_CLASS = "C{@ohos.base.BusinessError}"; static const std::unordered_map g_errorStringMap = { { STS_ERROR_PERMISSION_DENIED, "Permission denied." }, { STS_ERROR_NOT_SYSTEM_APP, "Not system app." }, @@ -75,7 +75,7 @@ ani_object BusinessErrorAni::CreateError(ani_env* env, ani_int code, const std:: ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass : %{public}d", status); return nullptr; } - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod : %{public}d", status); return nullptr; diff --git a/frameworks/ets/ani/common/src/ani_utils.cpp b/frameworks/ets/ani/common/src/ani_utils.cpp index 53842ea3a2ecd619b70382639c6fefcf36eb5407..754aa19c595a187b1d1fcac959cbb98dfd068e22 100644 --- a/frameworks/ets/ani/common/src/ani_utils.cpp +++ b/frameworks/ets/ani/common/src/ani_utils.cpp @@ -209,7 +209,7 @@ ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArra ani_size length = cArray.size(); ani_array_ref aArrayRef = nullptr; ani_class aStringcls = nullptr; - if (env->FindClass("Lstd/core/String;", &aStringcls) != ANI_OK) { + if (env->FindClass("C{std.core.String}", &aStringcls) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass String failed."); return nullptr; } @@ -289,12 +289,12 @@ ani_object CreateBooleanObject(ani_env *env, bool value) { ani_class persionCls; ani_status status = ANI_ERROR; - if ((status = env->FindClass("Lstd/core/Boolean;", &persionCls)) != ANI_OK) { + if ((status = env->FindClass("C{std.core.Boolean}", &persionCls)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass fail, status : %{public}d.", static_cast(status)); return nullptr; } ani_method personInfoCtor; - if ((status = env->Class_FindMethod(persionCls, "", "Z:V", &personInfoCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(persionCls, "", "z:", &personInfoCtor)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod fail, status : %{public}d.", static_cast(status)); return nullptr; } @@ -310,12 +310,12 @@ ani_object CreateIntObject(ani_env *env, int32_t value) { ani_class persionCls; ani_status status = ANI_ERROR; - if ((status = env->FindClass("Lstd/core/Int;", &persionCls)) != ANI_OK) { + if ((status = env->FindClass("C{std.core.Int}", &persionCls)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass fail, status : %{public}d.", static_cast(status)); return nullptr; } ani_method aniMethod; - if ((status = env->Class_FindMethod(persionCls, "", "I:V", &aniMethod)) != ANI_OK) { + if ((status = env->Class_FindMethod(persionCls, "", "i:", &aniMethod)) != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod fail, status : %{public}d.", static_cast(status)); return nullptr; } @@ -336,7 +336,7 @@ ani_object CreateClassObject(ani_env* env, const std::string& classDescriptor) return nullptr; } ani_method aniMethod; - status = env->Class_FindMethod(aniClass, "", ":V", &aniMethod); + status = env->Class_FindMethod(aniClass, "", ":", &aniMethod); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod failed, status: %{public}d!", status); return nullptr; @@ -353,11 +353,11 @@ ani_object CreateClassObject(ani_env* env, const std::string& classDescriptor) ani_object CreateArrayObject(ani_env* env, uint32_t length) { ani_class aniClass; - if (!AniFindClass(env, "Lescompat/Array;", aniClass)) { + if (!AniFindClass(env, "C{escompat.Array}", aniClass)) { return nullptr; } ani_method aniMethod; - ani_status status = env->Class_FindMethod(aniClass, "", "I:V", &aniMethod); + ani_status status = env->Class_FindMethod(aniClass, "", "i:", &aniMethod); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod failed, status: %{public}d!", status); return nullptr; diff --git a/frameworks/ets/ani/privacy/src/privacy_manager.cpp b/frameworks/ets/ani/privacy/src/privacy_manager.cpp index 9aadcd341fff766e683074aff25c02963a1415ba..1491a3b0cc36e4f49aa5192af1304f0a7e565e7d 100644 --- a/frameworks/ets/ani/privacy/src/privacy_manager.cpp +++ b/frameworks/ets/ani/privacy/src/privacy_manager.cpp @@ -168,7 +168,7 @@ void PermActiveStatusPtr::SetThreadId(const std::thread::id threadId) static ani_object ConvertActiveChangeResponse(ani_env* env, const ActiveChangeResponse& result) { - ani_object aniObject = CreateClassObject(env, "L@ohos/privacyManager/privacyManager/ActiveChangeResponseInner;"); + ani_object aniObject = CreateClassObject(env, "C{@ohos.privacyManager.privacyManager.ActiveChangeResponseInner}"); if (aniObject == nullptr) { return nullptr; } @@ -186,12 +186,12 @@ static ani_object ConvertActiveChangeResponse(ani_env* env, const ActiveChangeRe SetStringProperty(env, aniObject, ACTIVE_CHANGE_FIELD_DEVICE_ID, result.deviceId); // set activeStatus: PermissionActiveStatus - const char* activeStatusDes = "L@ohos/privacyManager/privacyManager/PermissionActiveStatus;"; + const char* activeStatusDes = "C{@ohos.privacyManager.privacyManager.PermissionActiveStatus}"; SetEnumProperty( env, aniObject, activeStatusDes, ACTIVE_CHANGE_FIELD_ACTIVE_STATUS, static_cast(result.type)); // set usedType?: PermissionUsedType - const char* permUsedTypeDes = "L@ohos/privacyManager/privacyManager/PermissionUsedType;"; + const char* permUsedTypeDes = "C{@ohos.privacyManager.privacyManager.PermissionUsedType}"; SetEnumProperty( env, aniObject, permUsedTypeDes, ACTIVE_CHANGE_FIELD_USED_TYPE, static_cast(result.usedType)); return aniObject; @@ -523,7 +523,7 @@ static void StartUsingPermissionExecute([[maybe_unused]] ani_env* env, static ani_object ConvertSingleUsedRecordDetail(ani_env* env, const UsedRecordDetail& record) { - ani_object arrayObj = CreateClassObject(env, "L@ohos/privacyManager/privacyManager/UsedRecordDetailInner;"); + ani_object arrayObj = CreateClassObject(env, "C{@ohos.privacyManager.privacyManager.UsedRecordDetailInner}"); if (arrayObj == nullptr) { return nullptr; } @@ -542,7 +542,7 @@ static ani_object ConvertSingleUsedRecordDetail(ani_env* env, const UsedRecordDe if (!SetOptionalIntProperty(env, arrayObj, "count", record.count)) { return nullptr; } - if (!SetEnumProperty(env, arrayObj, "L@ohos/privacyManager/privacyManager/PermissionUsedType;", "usedType", + if (!SetEnumProperty(env, arrayObj, "C{@ohos.privacyManager.privacyManager.PermissionUsedType}", "usedType", static_cast(record.type))) { return nullptr; } @@ -563,7 +563,7 @@ static ani_object ConvertUsedRecordDetails(ani_env* env, const std::vectorObject_CallMethodByName_Void( - arrayObj, "$_set", "ILstd/core/Object;:V", index, aniRecord); + arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "status : %{public}d", status); break; @@ -575,7 +575,7 @@ static ani_object ConvertUsedRecordDetails(ani_env* env, const std::vectorObject_CallMethodByName_Void( - arrayObj, "$_set", "ILstd/core/Object;:V", index, aniRecord); + arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR( LABEL, "Set permission record fail, status: %{public}d.", static_cast(status)); @@ -632,7 +632,7 @@ static ani_ref ConvertPermissionRecords(ani_env* env, const std::vectorObject_CallMethodByName_Void( - arrayObj, "$_set", "ILstd/core/Object;:V", index, aniRecord); + arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Set bundle record fail, status: %{public}d.", static_cast(status)); continue; @@ -683,7 +683,7 @@ static ani_object ConvertBundleUsedRecords(ani_env* env, const std::vectorFindClass("L@ohos/privacyManager/privacyManager/PermissionUsedRequest;", &requestClass)) { + if (ANI_OK != env->FindClass("C{@ohos.privacyManager.privacyManager.PermissionUsedRequest}", &requestClass)) { return false; } ani_boolean isRequestObject = false; @@ -881,7 +881,7 @@ void InitPrivacyFunction(ani_env *env) } ani_namespace ns; - if (ANI_OK != env->FindNamespace("L@ohos/privacyManager/privacyManager;", &ns)) { + if (ANI_OK != env->FindNamespace("C{@ohos.privacyManager.privacyManager}", &ns)) { ACCESSTOKEN_LOG_ERROR(LABEL, "FindNamespace privacyManager failed."); return; } @@ -936,4 +936,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS