diff --git a/ets_environment/frameworks/ets_environment/src/ets_environment.cpp b/ets_environment/frameworks/ets_environment/src/ets_environment.cpp index 28784aa68724ccb76c5fc14b370a135c1bda7e77..7fc48100a0e556c46b86ea67ade7371633e9e5bb 100644 --- a/ets_environment/frameworks/ets_environment/src/ets_environment.cpp +++ b/ets_environment/frameworks/ets_environment/src/ets_environment.cpp @@ -67,7 +67,7 @@ using DebuggerPostTask = std::function &&)>; const char ETS_SDK_NSNAME[] = "ets_sdk"; const char ETS_SYS_NSNAME[] = "ets_system"; -constexpr const char* CLASSNAME_LINKER = "Lstd/core/AbcRuntimeLinker;"; +constexpr const char* CLASSNAME_LINKER = "std.core.AbcRuntimeLinker"; } // namespace using namespace arkts::ani_signature; @@ -497,7 +497,7 @@ bool ETSEnvironment::LoadModule(const std::string &modulePath, const std::string } clsAni = static_cast(clsRef); ani_method method = nullptr; - if ((status = env->Class_FindMethod(clsAni, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(clsAni, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_FindMethod failed, status: %{public}d", status); return false; } @@ -793,7 +793,7 @@ bool ETSEnvironment::GetHspAbcRuntimeLinker(ani_array &refHspLinkerArray, ani_cl } ani_status status = ANI_ERROR; ani_method method = nullptr; - if ((status = aniEnv->Class_FindMethod(cls, "", "Lstd/core/RuntimeLinker;Lescompat/Array;:V", + if ((status = aniEnv->Class_FindMethod(cls, "", "C{std.core.RuntimeLinker}C{escompat.Array}:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_FindMethod ctor failed, status: %{public}d", status); return false; @@ -839,7 +839,7 @@ ani_object ETSEnvironment::CreateRuntimeLinker( if (refHspLinkerArray == nullptr) { ani_method runtimeLinkerCtorMethod = nullptr; if ((status = aniEnv->Class_FindMethod( - cls, "", "Lstd/core/RuntimeLinker;Lescompat/Array;:V", &runtimeLinkerCtorMethod)) != ANI_OK) { + cls, "", "C{std.core.RuntimeLinker}C{escompat.Array}:", &runtimeLinkerCtorMethod)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_FindMethod ctor failed, status: %{public}d", status); return nullptr; } @@ -852,7 +852,7 @@ ani_object ETSEnvironment::CreateRuntimeLinker( ani_method runtimeLinkerCtorMethodEx = nullptr; if ((status = aniEnv->Class_FindMethod(cls, "", - "Lstd/core/RuntimeLinker;Lescompat/Array;[Lstd/core/RuntimeLinker;:V", + "C{std.core.RuntimeLinker}C{escompat.Array}C{escompat.Array}:", &runtimeLinkerCtorMethodEx)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_FindMethod ctor failed, status: %{public}d", status); return nullptr; diff --git a/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_callback.cpp b/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_callback.cpp index c73222dc642575bc2395ecdb4c19ce2f83b6360f..8489fa41e2b88b743c183581c514d2bc406a2d56 100644 --- a/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_callback.cpp +++ b/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_callback.cpp @@ -24,7 +24,7 @@ namespace AbilityRuntime { namespace { constexpr const char *METHOD_ON = "onAutoStartupOn"; constexpr const char *METHOD_OFF = "onAutoStartupOff"; -constexpr const char *SIGNATURE_AUTO_STARTUP_INFO = "Lapplication/AutoStartupInfo/AutoStartupInfo;:V"; +constexpr const char *SIGNATURE_AUTO_STARTUP_INFO = "C{application.AutoStartupInfo.AutoStartupInfo}:"; } // namespace EtsAbilityAutoStartupCallback::EtsAbilityAutoStartupCallback(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_manager_utils.cpp b/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_manager_utils.cpp index e96c0728987a755caae06a03ffe0b4ada29ffe3f..895b39d20444d0530badeaff35ed466648dc440c 100644 --- a/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_manager_utils.cpp +++ b/frameworks/ets/ani/ability_auto_startup_callback/src/ets_ability_auto_startup_manager_utils.cpp @@ -22,8 +22,8 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *CLASSNAME_ARRAY = "Lescompat/Array;"; -constexpr const char *SIGNATURE_AUTO_STARTUP_INFO = "Lapplication/AutoStartupInfo/AutoStartupInfoInner;"; +constexpr const char *CLASSNAME_ARRAY = "escompat.Array"; +constexpr const char *SIGNATURE_AUTO_STARTUP_INFO = "application.AutoStartupInfo.AutoStartupInfoInner"; } bool UnwrapAutoStartupInfo(ani_env *env, ani_object param, AutoStartupInfo &info) { @@ -114,7 +114,7 @@ ani_object ConvertAutoStartupInfos(ani_env *env, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK || arrayCtor == nullptr) { TAG_LOGE(AAFwkTag::AUTO_STARTUP, "find ctor failed status : %{public}d or null arrayCtor", status); return nullptr; @@ -132,7 +132,7 @@ ani_object ConvertAutoStartupInfos(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, ani_info); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, ani_info); if (status != ANI_OK) { TAG_LOGW(AAFwkTag::AUTO_STARTUP, "Object_CallMethodByName_Void failed status : %{public}d", status); break; @@ -156,7 +156,7 @@ ani_object CreateAniAutoStartupInfo(ani_env *env, const AutoStartupInfo &info) TAG_LOGE(AAFwkTag::AUTO_STARTUP, "find class failed status : %{public}d or null cls", status); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::AUTO_STARTUP, "find ctor failed status : %{public}d or null method", status); return nullptr; } diff --git a/frameworks/ets/ani/ability_auto_startup_manager/src/ets_ability_auto_startup_manager.cpp b/frameworks/ets/ani/ability_auto_startup_manager/src/ets_ability_auto_startup_manager.cpp index b2e0536f0d1e20a97ccf20fcb2fc4102bd8df801..a2ae4ef0926c39640eef98c593b5a6c355614907 100644 --- a/frameworks/ets/ani/ability_auto_startup_manager/src/ets_ability_auto_startup_manager.cpp +++ b/frameworks/ets/ani/ability_auto_startup_manager/src/ets_ability_auto_startup_manager.cpp @@ -30,7 +30,7 @@ using namespace OHOS::AAFwk; namespace { constexpr int32_t INVALID_PARAM = static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM); constexpr const char *ETS_AUTO_STARTUP_MANAGER_NAMESPACE = - "L@ohos/app/ability/autoStartupManager/autoStartupManager;"; + "@ohos.app.ability.autoStartupManager.autoStartupManager"; constexpr const char *ON_OFF_TYPE_SYSTEM = "systemAutoStartup"; } // namespace @@ -208,19 +208,19 @@ void EtsAbilityAutoStartupManagerInit(ani_env *env) } std::array methods = { ani_native_function {"nativeOnApplicationAutoStartupStateChangeSync", - "Lstd/core/String;Lapplication/AutoStartupCallback/AutoStartupCallback;:V", + "C{std.core.String}C{application.AutoStartupCallback.AutoStartupCallback}:", reinterpret_cast(EtsAbilityAutoStartupManager::RegisterAutoStartupCallback)}, ani_native_function {"nativeOffApplicationAutoStartupStateChangeSync", - "Lstd/core/String;Lapplication/AutoStartupCallback/AutoStartupCallback;:V", + "C{std.core.String}C{application.AutoStartupCallback.AutoStartupCallback}:", reinterpret_cast(EtsAbilityAutoStartupManager::UnregisterAutoStartupCallback)}, ani_native_function {"nativeSetApplicationAutoStartup", - "Lapplication/AutoStartupInfo/AutoStartupInfo;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.AutoStartupInfo.AutoStartupInfo}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityAutoStartupManager::SetApplicationAutoStartup)}, ani_native_function {"nativeCancelApplicationAutoStartup", - "Lapplication/AutoStartupInfo/AutoStartupInfo;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.AutoStartupInfo.AutoStartupInfo}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityAutoStartupManager::CancelApplicationAutoStartup)}, ani_native_function {"nativeQueryAllAutoStartupApplications", - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityAutoStartupManager::QueryAllAutoStartupApplications)}, }; status = env->Namespace_BindNativeFunctions(ns, methods.data(), methods.size()); diff --git a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator.cpp b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator.cpp index b5d00a6db2ef1a1f87d7d4cb808fd888ca63704f..09ae8d927cff08aa386fd39bae59b5205af296ec 100644 --- a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator.cpp +++ b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator.cpp @@ -41,9 +41,9 @@ std::mutex g_mtxStageMonitorRecord; std::mutex g_mutexAbilityRecord; namespace { -constexpr const char* CONTEXT_CLASS_NAME = "Lapplication/Context/Context;"; -constexpr const char* SHELL_CMD_RESULT_CLASS_NAME = "Lapplication/shellCmdResult/ShellCmdResultImpl;"; -constexpr const char* ABILITY_STAGE_CLASS_NAME = "L@ohos/app/ability/AbilityStage/AbilityStage;"; +constexpr const char* CONTEXT_CLASS_NAME = "application.Context.Context"; +constexpr const char* SHELL_CMD_RESULT_CLASS_NAME = "application.shellCmdResult.ShellCmdResultImpl"; +constexpr const char* ABILITY_STAGE_CLASS_NAME = "@ohos.app.ability.AbilityStage.AbilityStage"; constexpr int COMMON_FAILED = 16000100; constexpr ani_double INVALID_LIFECYCLE_STATE = -1; } @@ -89,7 +89,7 @@ ani_object EtsAbilityDelegator::SetAppContext(ani_env *env, const std::shared_pt TAG_LOGE(AAFwkTag::DELEGATOR, "FindClass status: %{public}d", status); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod status: %{public}d", status); return nullptr; } @@ -127,7 +127,7 @@ ani_object EtsAbilityDelegator::WrapShellCmdResult(ani_env *env, std::unique_ptr return {}; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod ctor failed status: %{public}d", status); return {}; @@ -1160,7 +1160,7 @@ bool EtsAbilityDelegator::CheckPropertyValue(ani_env *env, int &resultCode, ani_ TAG_LOGE(AAFwkTag::DELEGATOR, "find AbilityDelegator failed status: %{public}d", status); } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod ctor failed status: %{public}d", status); } diff --git a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_registry.cpp b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_registry.cpp index 76673d5ff46810a141f12b987de2b6c279614426..0cb3e0006345a41156c147e2ca325d9c3ec9d723 100644 --- a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_registry.cpp +++ b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_registry.cpp @@ -30,10 +30,10 @@ std::mutex etsReferenceMutex; namespace { constexpr const char* ETS_DELEGATOR_REGISTRY_NAMESPACE = - "L@ohos/app/ability/abilityDelegatorRegistry/abilityDelegatorRegistry;"; -constexpr const char* ETS_DELEGATOR_REGISTRY_SIGNATURE_DELEAGTOR = ":Lapplication/AbilityDelegator/AbilityDelegator;"; + "@ohos.app.ability.abilityDelegatorRegistry.abilityDelegatorRegistry"; +constexpr const char* ETS_DELEGATOR_REGISTRY_SIGNATURE_DELEAGTOR = ":C{application.AbilityDelegator.AbilityDelegator}"; constexpr const char* ETS_DELEGATOR_REGISTRY_SIGNATURE_ATGS = - ":Lapplication/abilityDelegatorArgs/AbilityDelegatorArgs;";; + ":C{application.abilityDelegatorArgs.AbilityDelegatorArgs}";; } static ani_object GetAbilityDelegator(ani_env *env) { diff --git a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_utils.cpp b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_utils.cpp index 4a8af25df5cdd262389fc8578b5eb43d161f94aa..9f0863cc7022dc6accad36be9b707899952e504f 100644 --- a/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_utils.cpp +++ b/frameworks/ets/ani/ability_delegator/src/ets_ability_delegator_utils.cpp @@ -23,31 +23,31 @@ namespace OHOS { namespace AbilityDelegatorEts { namespace { -constexpr const char* ABILITY_DELEGATOR_CLASS_NAME = "Lapplication/AbilityDelegator/AbilityDelegatorInner;"; -constexpr const char* RECORD_CLASS_NAME = "Lescompat/Record;"; -constexpr const char* VOID_CONTEXT = ":Lapplication/Context/Context;"; -constexpr const char* STRING_NUMBER_ASYNCCALLBACK = "Lstd/core/String;JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* STRING_VOID = "Lstd/core/String;:V"; +constexpr const char* ABILITY_DELEGATOR_CLASS_NAME = "application.AbilityDelegator.AbilityDelegatorInner"; +constexpr const char* RECORD_CLASS_NAME = "escompat.Record"; +constexpr const char* VOID_CONTEXT = ":C{application.Context.Context}"; +constexpr const char* STRING_NUMBER_ASYNCCALLBACK = "C{std.core.String}lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* STRING_VOID = "C{std.core.String}:"; constexpr const char* MONITOR_ASYNCCALLBACK_VOID = - "Lapplication/AbilityMonitor/AbilityMonitor;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* WANT_ASYNCCALLBACK = "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{application.AbilityMonitor.AbilityMonitor}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* WANT_ASYNCCALLBACK = "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char* ARGS_ABILITY_DELEGATOR_CLASS_NAME = - "Lapplication/abilityDelegatorArgs/AbilityDelegatorArgsInner;"; -constexpr const char* SIGNATURE_MONITOR_VOID = "Lapplication/AbilityMonitor/AbilityMonitor;:V"; + "application.abilityDelegatorArgs.AbilityDelegatorArgsInner"; +constexpr const char* SIGNATURE_MONITOR_VOID = "C{application.AbilityMonitor.AbilityMonitor}:"; constexpr const char* SIGNATURE_MONITOR_NUMBER_ASYNCCALLBACK = - "Lapplication/AbilityMonitor/AbilityMonitor;JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{application.AbilityMonitor.AbilityMonitor}lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char* STAGEMONITOR_ASYNCCALLBACK_VOID = - "Lapplication/AbilityStageMonitor/AbilityStageMonitor;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{application.AbilityStageMonitor.AbilityStageMonitor}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char* STAGEMONITOR_VOID = - "Lapplication/AbilityStageMonitor/AbilityStageMonitor;:V"; + "C{application.AbilityStageMonitor.AbilityStageMonitor}:"; constexpr const char* SIGNATURE_STAGEMONITOR_NUMBER_ASYNCCALLBACK = - "Lapplication/AbilityStageMonitor/AbilityStageMonitor;JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{application.AbilityStageMonitor.AbilityStageMonitor}lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char* STAGEMONITOR_UIABILITY_ASYNCCALLBACK = - "L@ohos/app/ability/UIAbility/UIAbility;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* STRING_ASYNCCALLBACK_VOID = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* STRING_UIABILITY_NUMBER = "L@ohos/app/ability/UIAbility/UIAbility;:I"; + "C{@ohos.app.ability.UIAbility.UIAbility}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* STRING_ASYNCCALLBACK_VOID = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* STRING_UIABILITY_NUMBER = "C{@ohos.app.ability.UIAbility.UIAbility}:i"; constexpr const char* STRING_CALLBACK_UIABILITY = - "Lutils/AbilityUtils/AsyncCallbackWrapper;:L@ohos/app/ability/UIAbility/UIAbility;"; + "C{utils.AbilityUtils.AsyncCallbackWrapper}:C{@ohos.app.ability.UIAbility.UIAbility}"; constexpr const char* RECORD_GET_NAME = "X{C{std.core.BaseEnum}C{std.core.Numeric}C{std.core.String}}:C{std.core.Object}"; constexpr const char* RECORD_SET_NAME = @@ -132,7 +132,7 @@ ani_object CreateEtsAbilityDelegator(ani_env *aniEnv) } ani_method method = nullptr; - status = aniEnv->Class_FindMethod(abilityDelegator, "", ":V", &method); + status = aniEnv->Class_FindMethod(abilityDelegator, "", ":", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod ctor failed status: %{public}d", status); return {}; @@ -212,7 +212,7 @@ void SetParameters(ani_env *aniEnv, ani_class arguments, ani_object argumentObje } ani_ref parameterRef = nullptr; status = aniEnv->Object_CallMethodByName_Ref(argumentObject, Builder::BuildGetterName("parameters").c_str(), - ":Lescompat/Record;", ¶meterRef); + ":C{escompat.Record}", ¶meterRef); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Object_CallMethodByName_Ref failed status: %{public}d", status); return; @@ -329,7 +329,7 @@ ani_object CreateEtsAbilityDelegatorArguments( TAG_LOGD(AAFwkTag::DELEGATOR, "find AbilityDelegatorArgs success"); ani_method method = nullptr; - status = aniEnv->Class_FindMethod(arguments, "", ":V", &method); + status = aniEnv->Class_FindMethod(arguments, "", ":", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod ctor failed status: %{public}d", status); return {}; diff --git a/frameworks/ets/ani/ability_manager/src/ets_ability_foreground_state_observer.cpp b/frameworks/ets/ani/ability_manager/src/ets_ability_foreground_state_observer.cpp index 29adb4cf75a70d53b1ca7c6ced8a20ebfcf2d111..8a443d09d795e200cf6eace916cfc6cfb5ff0c5d 100644 --- a/frameworks/ets/ani/ability_manager/src/ets_ability_foreground_state_observer.cpp +++ b/frameworks/ets/ani/ability_manager/src/ets_ability_foreground_state_observer.cpp @@ -23,8 +23,8 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* ABILITY_FOREGROUND_STATE_OBSERVER_CLASS_NAME = - "Lapplication/AbilityForegroundStateObserver/AbilityForegroundStateObserver;"; -constexpr const char *SIGNATURE_ABILITY_STATE_DATA = "Lapplication/AbilityStateData/AbilityStateData;:V"; + "application.AbilityForegroundStateObserver.AbilityForegroundStateObserver"; +constexpr const char *SIGNATURE_ABILITY_STATE_DATA = "C{application.AbilityStateData.AbilityStateData}:"; } ETSAbilityForegroundStateObserver::ETSAbilityForegroundStateObserver(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp index 7bc8aa86e2186102cd8c7a905b6378b7a2dfea33..f5ef353fb87b23fb1d262f9a6cb5212c2217172d 100644 --- a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp +++ b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp @@ -41,9 +41,9 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char* ETS_ABILITY_MANAGER_NAMESPACE = "L@ohos/app/ability/abilityManager/abilityManager;"; -constexpr const char* ETS_ABILITY_MANAGER_SIGNATURE_ARRAY = ":Lescompat/Array;"; -constexpr const char* ETS_ABILITY_MANAGER_SIGNATURE_CALLBACK = "Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; +constexpr const char* ETS_ABILITY_MANAGER_NAMESPACE = "@ohos.app.ability.abilityManager.abilityManager"; +constexpr const char* ETS_ABILITY_MANAGER_SIGNATURE_ARRAY = ":C{escompat.Array}"; +constexpr const char* ETS_ABILITY_MANAGER_SIGNATURE_CALLBACK = "C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char *ON_OFF_TYPE_ABILITY_FOREGROUND_STATE = "abilityForegroundState"; constexpr int32_t ERR_FAILURE = -1; @@ -701,22 +701,22 @@ void EtsAbilityManagerRegistryInit(ani_env *env) reinterpret_cast(EtsAbilityManager::GetForegroundUIAbilities) }, ani_native_function { - "getForegroundUIAbilitiesCallback", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "getForegroundUIAbilitiesCallback", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityManager::GetForegroundUIAbilitiesCallBack) }, ani_native_function {"nativeGetTopAbility", ETS_ABILITY_MANAGER_SIGNATURE_CALLBACK, reinterpret_cast(EtsAbilityManager::GetTopAbility)}, - ani_native_function { "nativeGetAbilityRunningInfos", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeGetAbilityRunningInfos", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityManager::GetAbilityRunningInfos) }, - ani_native_function {"nativeGetExtensionRunningInfos", "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function {"nativeGetExtensionRunningInfos", "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityManager::GetExtensionRunningInfos)}, ani_native_function { "nativeIsEmbeddedOpenAllowed", - "Lapplication/Context/Context;Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.Context.Context}C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityManager::IsEmbeddedOpenAllowed) }, ani_native_function { "nativeQueryAtomicServiceStartupRule", - "Lapplication/Context/Context;Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.Context.Context}C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityManager::QueryAtomicServiceStartupRule) }, - ani_native_function { "nativeQueryAtomicServiceStartupRuleCheck", "Lapplication/Context/Context;:V", + ani_native_function { "nativeQueryAtomicServiceStartupRuleCheck", "C{application.Context.Context}:", reinterpret_cast(EtsAbilityManager::QueryAtomicServiceStartupRuleCheck) }, ani_native_function { "nativeOn", nullptr, reinterpret_cast(EtsAbilityManager::NativeOn) }, ani_native_function { "nativeOff", nullptr, reinterpret_cast(EtsAbilityManager::NativeOff) }, diff --git a/frameworks/ets/ani/ability_manager/src/ets_ability_manager_utils.cpp b/frameworks/ets/ani/ability_manager/src/ets_ability_manager_utils.cpp index 6af6313bbff64448633536438a206baf5128fd42..e53abc806c72d11fd8dd9ff5ec612e6e488f23d5 100644 --- a/frameworks/ets/ani/ability_manager/src/ets_ability_manager_utils.cpp +++ b/frameworks/ets/ani/ability_manager/src/ets_ability_manager_utils.cpp @@ -21,13 +21,13 @@ namespace OHOS { namespace AbilityManagerEts { -constexpr const char *CLASSNAME_ARRAY = "Lescompat/Array;"; -constexpr const char *SET_OBJECT_VOID_SIGNATURE = "ILstd/core/Object;:V"; -constexpr const char *CLASSNAME_ABILITY_RRUNNINGINFO = "Lapplication/AbilityRunningInfo/AbilityRunningInfoImpl;"; -constexpr const char *ABILITY_STATE_ENUM_NAME = "L@ohos/app/ability/abilityManager/abilityManager/AbilityState;"; -constexpr const char *CLASSNAME_EXTENSION_RUNNINGINFO = "Lapplication/ExtensionRunningInfo/ExtensionRunningInfoInner;"; +constexpr const char *CLASSNAME_ARRAY = "escompat.Array"; +constexpr const char *SET_OBJECT_VOID_SIGNATURE = "iC{std.core.Object}:"; +constexpr const char *CLASSNAME_ABILITY_RRUNNINGINFO = "application.AbilityRunningInfo.AbilityRunningInfoImpl"; +constexpr const char *ABILITY_STATE_ENUM_NAME = "@ohos.app.ability.abilityManager.abilityManager.AbilityState"; +constexpr const char *CLASSNAME_EXTENSION_RUNNINGINFO = "application.ExtensionRunningInfo.ExtensionRunningInfoInner"; constexpr const char *EXTENSION_ABILITY_TYPE_ENUM_NAME - = "L@ohos/bundle/bundleManager/bundleManager/ExtensionAbilityType;"; + = "@ohos.bundle.bundleManager.bundleManager.ExtensionAbilityType"; bool WrapAbilityRunningInfoArray( ani_env *env, ani_object &arrayObj, const std::vector &infos) @@ -48,7 +48,7 @@ bool WrapAbilityRunningInfoArray( TAG_LOGE(AAFwkTag::ABILITYMGR, "null arrayCls"); return false; } - if ((status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "status : %{public}d", status); return false; } @@ -102,7 +102,7 @@ bool WrapAbilityRunningInfo(ani_env *env, ani_object &infoObj, const AAFwk::Abil return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "findMethod failed, status: %{public}d", status); return false; } @@ -174,7 +174,7 @@ bool WrapArrayString(ani_env *env, ani_object &arrayObj, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "findMethod failed, status : %{public}d", status); return false; } @@ -196,7 +196,7 @@ bool WrapArrayString(ani_env *env, ani_object &arrayObj, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", i, aniStr); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, aniStr); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Object_CallMethodByName_Void failed, status : %{public}d", status); return false; @@ -220,7 +220,7 @@ bool WrapExtensionRunningInfoArray( TAG_LOGE(AAFwkTag::ABILITYMGR, "FindClass failed, status : %{public}d", status); return false; } - if ((status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor)) != ANI_OK || arrayCtor == nullptr) { + if ((status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor)) != ANI_OK || arrayCtor == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Class_FindMethod failed, status : %{public}d", status); return false; } @@ -266,7 +266,7 @@ bool WrapExtensionRunningInfo(ani_env *env, ani_object &infoObj, const AAFwk::Ex return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "findMethod failed, status: %{public}d", status); return false; } @@ -388,7 +388,7 @@ ani_object WrapAbilityStateData(ani_env *env, const AbilityStateData &abilitySta TAG_LOGE(AAFwkTag::ABILITYMGR, "null env"); return nullptr; } - if ((status = env->FindClass("Lapplication/AbilityStateData/AbilityStateData;", &cls)) != ANI_OK) { + if ((status = env->FindClass("application.AbilityStateData.AbilityStateData", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "find class failed status : %{public}d", status); return nullptr; } @@ -396,7 +396,7 @@ ani_object WrapAbilityStateData(ani_env *env, const AbilityStateData &abilitySta TAG_LOGE(AAFwkTag::ABILITYMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "find ctor failed status : %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ability_manager/src/ets_query_erms_observer.cpp b/frameworks/ets/ani/ability_manager/src/ets_query_erms_observer.cpp index 6562838cbe73313cc929a1655d657768fa98e332..3d51a90f1aeba3b50d996a1b36ac52613490d167 100644 --- a/frameworks/ets/ani/ability_manager/src/ets_query_erms_observer.cpp +++ b/frameworks/ets/ani/ability_manager/src/ets_query_erms_observer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char *ATOMIC_SERVICE_STARTUP_RULE_IMPL_CLASS_NAME = - "L@ohos/app/ability/abilityManager/abilityManager/AtomicServiceStartupRuleImpl;"; + "@ohos.app.ability.abilityManager.abilityManager.AtomicServiceStartupRuleImpl"; } EtsQueryERMSObserver::EtsQueryERMSObserver(ani_vm *etsVm) : etsVm_(etsVm) {} @@ -133,7 +133,7 @@ bool EtsQueryERMSObserver::WrapAtomicServiceStartupRule(ani_env *env, return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::UIABILITY, "status : %{public}d", status); return false; } diff --git a/frameworks/ets/ani/ani_common/include/ani_common_cache_mgr.h b/frameworks/ets/ani/ani_common/include/ani_common_cache_mgr.h index 0a3e08af1c0daa7faf8b5ebf615b50d4211cdb7a..0ff06dabb16430c9e2da10224f2f3b15145db179 100644 --- a/frameworks/ets/ani/ani_common/include/ani_common_cache_mgr.h +++ b/frameworks/ets/ani/ani_common/include/ani_common_cache_mgr.h @@ -23,14 +23,14 @@ namespace OHOS { namespace AppExecFwk { -constexpr const char *CLASSNAME_BOOLEAN = "Lstd/core/Boolean;"; -constexpr const char *CLASSNAME_SHORT = "Lstd/core/Short;"; -constexpr const char *CLASSNAME_INT = "Lstd/core/Int;"; -constexpr const char *CLASSNAME_LONG = "Lstd/core/Long;"; -constexpr const char *CLASSNAME_FLOAT = "Lstd/core/Float;"; -constexpr const char *CLASSNAME_DOUBLE = "Lstd/core/Double;"; -constexpr const char *CLASSNAME_STRING = "Lstd/core/String;"; -constexpr const char *CLASSNAME_RECORD = "Lescompat/Record;"; +constexpr const char *CLASSNAME_BOOLEAN = "std.core.Boolean"; +constexpr const char *CLASSNAME_SHORT = "std.core.Short"; +constexpr const char *CLASSNAME_INT = "std.core.Int"; +constexpr const char *CLASSNAME_LONG = "std.core.Long"; +constexpr const char *CLASSNAME_FLOAT = "std.core.Float"; +constexpr const char *CLASSNAME_DOUBLE = "std.core.Double"; +constexpr const char *CLASSNAME_STRING = "std.core.String"; +constexpr const char *CLASSNAME_RECORD = "escompat.Record"; using AniCommonMethodCacheKey = std::pair; diff --git a/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp b/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp index 392ffd0662d473a0c285e82bac46f10aa3466264..71a448c9cbc4162c5eee71bd51e22b03f48a1959 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace AppExecFwk { namespace { -constexpr const char *ABILITY_RESULT_CLASS_NAME = "Lability/abilityResult/AbilityResultInner;"; +constexpr const char *ABILITY_RESULT_CLASS_NAME = "ability.abilityResult.AbilityResultInner"; } // namespace using namespace arkts::ani_signature; diff --git a/frameworks/ets/ani/ani_common/src/ani_common_ability_state_data.cpp b/frameworks/ets/ani/ani_common/src/ani_common_ability_state_data.cpp index ff24c46cfdd0c4b2a3d1d125c0c0de19af71d20a..38a4a0240a3ce8350e4492296e7168a05133b964 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_ability_state_data.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_ability_state_data.cpp @@ -85,14 +85,14 @@ ani_object WrapAbilityStateData(ani_env *env, const AbilityStateData &data) ani_status status = ANI_ERROR; ani_method ctor = nullptr; ani_object object = nullptr; - static const char *className = "Lapplication/AbilityStateData/AbilityStateData;"; + static const char *className = "application.AbilityStateData.AbilityStateData"; if ((status = env->FindClass(className, &cls)) != ANI_OK || cls == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "FindClass status : %{public}d or null cls", status); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &ctor)) != ANI_OK || ctor == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &ctor)) != ANI_OK || ctor == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Class_FindMethod status : %{public}d or null ctor", status); return nullptr; } @@ -118,14 +118,14 @@ ani_object CreateAniAbilityStateDataArray(ani_env *env, const std::vectorFindClass(className, &cls)) != ANI_OK || cls == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "FindClass status : %{public}d or null cls", status); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", "I:V", &ctor)) != ANI_OK || ctor == nullptr) { + if ((status = env->Class_FindMethod(cls, "", "i:", &ctor)) != ANI_OK || ctor == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Class_FindMethod status : %{public}d or null ctor", status); return nullptr; } @@ -142,7 +142,7 @@ ani_object CreateAniAbilityStateDataArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(object, "$_set", "ILstd/core/Object;:V", index, obj)) { + if (ANI_OK != env->Object_CallMethodByName_Void(object, "$_set", "iC{std.core.Object}:", index, obj)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Object_CallMethodByName_Void failed"); return nullptr; } diff --git a/frameworks/ets/ani/ani_common/src/ani_common_configuration.cpp b/frameworks/ets/ani/ani_common/src/ani_common_configuration.cpp index cdc17018697f499242428455eba1f201e22971c4..da707950e23c661bc1032e84f8d5fa6960ebf0bc 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_configuration.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_configuration.cpp @@ -27,12 +27,12 @@ constexpr double FONT_SIZE_MAX_SCALE = 3.2; constexpr double FONT_WEIGHT_MIN_SCALE = 0.0; constexpr double FONT_WEIGHT_MAX_SCALE = 1.25; constexpr const char* COLOR_MODE_ENUM_NAME = - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/ColorMode;"; + "@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.ColorMode"; constexpr const char* DIRECTION_ENUM_NAME = - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/Direction;"; + "@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.Direction"; constexpr const char* DENSITY_ENUM_NAME = - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/ScreenDensity;"; -constexpr const char* CONFIGURATION_IMPL_CLASS_NAME = "L@ohos/app/ability/Configuration/ConfigurationImpl;"; + "@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.ScreenDensity"; +constexpr const char* CONFIGURATION_IMPL_CLASS_NAME = "@ohos.app.ability.Configuration.ConfigurationImpl"; void SetBasicConfiguration(ani_env *env, ani_object object, const AppExecFwk::Configuration &configuration) { @@ -111,7 +111,7 @@ ani_object WrapConfiguration(ani_env *env, const AppExecFwk::Configuration &conf return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod status: %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ani_common/src/ani_common_execute_result.cpp b/frameworks/ets/ani/ani_common/src/ani_common_execute_result.cpp index b1efbe743425eef30dd931f13d8deb70f3450500..4f67fb304382cebd53b122bc8cf2ea9213859a7c 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_execute_result.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_execute_result.cpp @@ -112,7 +112,7 @@ ani_object WrapExecuteResult(ani_env *env, const AppExecFwk::InsightIntentExecut ani_method ctor = nullptr; ani_object objValue = {}; - if ((status = env->FindClass("L@ohos/app/ability/insightIntent/insightIntent/ExecuteResultInner;", + if ((status = env->FindClass("@ohos.app.ability.insightIntent.insightIntent.ExecuteResultInner", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::INTENT, "status: %{public}d", status); return nullptr; @@ -155,7 +155,7 @@ ani_object CreateNullExecuteResult(ani_env *env) ani_method ctor = nullptr; ani_object objValue = {}; - if ((status = env->FindClass("L@ohos/app/ability/insightIntent/insightIntent/ExecuteResultInner;", + if ((status = env->FindClass("@ohos.app.ability.insightIntent.insightIntent.ExecuteResultInner", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::INTENT, "status: %{public}d", status); diff --git a/frameworks/ets/ani/ani_common/src/ani_common_remote.cpp b/frameworks/ets/ani/ani_common/src/ani_common_remote.cpp index f74600380b2d68ca5ee3d2364a5600f9ce27a8ff..fba7e8cf408bc0c95861844872755e70164e6d42 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_remote.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_remote.cpp @@ -24,7 +24,7 @@ ani_object AniRemote::CreateAniRemoteObject(ani_env *env, const sptrFindClass("L@ohos/rpc/rpc/RemoteProxy;", &cls)) != ANI_OK) { + if ((status = env->FindClass("@ohos.rpc.rpc.RemoteProxy", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::ABILITY, "FindClass RemoteProxy: %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ani_common/src/ani_common_util.cpp b/frameworks/ets/ani/ani_common/src/ani_common_util.cpp index 096f199608922f8c647ccd51cb5f2a853dd86e54..78139abacad4732b0de53e368a047bad42cbb062 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_util.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_util.cpp @@ -26,16 +26,16 @@ namespace OHOS { namespace AppExecFwk { namespace { -constexpr const char* CLASSNAME_DOUBLE = "Lstd/core/Double;"; -constexpr const char* CLASSNAME_BOOL = "Lstd/core/Boolean;"; -constexpr const char* CLASSNAME_ARRAY = "Lescompat/Array;"; -constexpr const char* CLASSNAME_LONG = "Lstd/core/Long;"; -constexpr const char* CLASSNAME_INT = "Lstd/core/Int;"; -constexpr const char* CLASSNAME_ASYNC_CALLBACK_WRAPPER = "Lutils/AbilityUtils/AsyncCallbackWrapper;"; -constexpr const char* SET_OBJECT_VOID_SIGNATURE = "ILstd/core/Object;:V"; -constexpr const char* CLASSNAME_INNER = "Lapplication/ProcessInformation/ProcessInformationInner;"; -constexpr const char* ENUMNAME_PROCESS = "L@ohos/app/ability/appManager/appManager/ProcessState;"; -constexpr const char* ENUMNAME_BUNDLE = "L@ohos/bundle/bundleManager/bundleManager/BundleType;"; +constexpr const char* CLASSNAME_DOUBLE = "std.core.Double"; +constexpr const char* CLASSNAME_BOOL = "std.core.Boolean"; +constexpr const char* CLASSNAME_ARRAY = "escompat.Array"; +constexpr const char* CLASSNAME_LONG = "std.core.Long"; +constexpr const char* CLASSNAME_INT = "std.core.Int"; +constexpr const char* CLASSNAME_ASYNC_CALLBACK_WRAPPER = "utils.AbilityUtils.AsyncCallbackWrapper"; +constexpr const char* SET_OBJECT_VOID_SIGNATURE = "iC{std.core.Object}:"; +constexpr const char* CLASSNAME_INNER = "application.ProcessInformation.ProcessInformationInner"; +constexpr const char* ENUMNAME_PROCESS = "@ohos.app.ability.appManager.appManager.ProcessState"; +constexpr const char* ENUMNAME_BUNDLE = "@ohos.bundle.bundleManager.bundleManager.BundleType"; } bool GetFieldDoubleByName(ani_env *env, ani_object object, const char *name, double &value) @@ -336,7 +336,7 @@ bool GetFieldStringArrayByName(ani_env *env, ani_object object, const char *name for (int i = 0; i < static_cast(length); i++) { ani_ref stringEntryRef; status = env->Object_CallMethodByName_Ref(reinterpret_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &stringEntryRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &stringEntryRef, (ani_int)i); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d, index: %{public}d", status, i); return false; @@ -371,7 +371,7 @@ bool SetFieldArrayStringByName(ani_env *env, ani_class cls, ani_object object, c return false; } ani_method arrayCtor = nullptr; - if ((status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return false; } @@ -386,7 +386,7 @@ bool SetFieldArrayStringByName(ani_env *env, ani_class cls, ani_object object, c TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return false; } - if ((status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", + if ((status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, str)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return false; @@ -490,7 +490,7 @@ ani_object CreateDouble(ani_env *env, ani_double value) return nullptr; } ani_method ctor = nullptr; - if ((status = env->Class_FindMethod(cls, "", "D:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "d:", &ctor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return nullptr; } @@ -515,7 +515,7 @@ ani_object CreateBoolean(ani_env *env, ani_boolean value) return nullptr; } ani_method ctor = nullptr; - if ((status = env->Class_FindMethod(cls, "", "Z:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "z:", &ctor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return nullptr; } @@ -551,7 +551,7 @@ ani_object CreateLong(ani_env *env, ani_long value) return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod status: %{public}d, or null method", status); return nullptr; } @@ -686,7 +686,7 @@ ani_object CreateInt(ani_env *env, ani_int value) return nullptr; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "I:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "i:", &ctor)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod status : %{public}d", status); return nullptr; } @@ -761,7 +761,7 @@ bool WrapArrayString(ani_env *env, ani_object &arrayObj, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return false; @@ -896,7 +896,7 @@ ani_object WrapProcessInformation(ani_env *env, const AppExecFwk::RunningProcess TAG_LOGE(AAFwkTag::ANI, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "find ctor failed status: %{public}d", status); return nullptr; } @@ -932,7 +932,7 @@ ani_object CreateRunningProcessInfoArray(ani_env *env, std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "find ctor failed status: %{public}d", status); return nullptr; @@ -951,7 +951,7 @@ ani_object CreateRunningProcessInfoArray(ani_env *env, std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, aniInfo); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, aniInfo); if (status != ANI_OK) { TAG_LOGW(AAFwkTag::ANI, "Object_CallMethodByName_Void failed status: %{public}d", status); break; @@ -975,7 +975,7 @@ ani_object CreateEmptyArray(ani_env *env) return nullptr; } ani_method arrayCtor; - status = env->Class_FindMethod(arrayCls, "", ":V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", ":", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "find ctor failed status: %{public}d", status); return nullptr; @@ -1459,7 +1459,7 @@ ani_object WrapLocale(ani_env *env, const std::string &locale) } ani_class localClass = nullptr; ani_status status = ANI_ERROR; - if ((status = env->FindClass("Lstd/core/Intl/Locale;", &localClass)) != ANI_OK) { + if ((status = env->FindClass("std.core.Intl.Locale", &localClass)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "Find class failed, status: %{public}d", status); return nullptr; } @@ -1497,14 +1497,14 @@ ani_object CreateIntAniArray(ani_env *env, const std::vector &dataArry) return nullptr; } - status = env->FindClass("Lescompat/Array;", &arrayCls); + status = env->FindClass("escompat.Array", &arrayCls); if (status != ANI_OK || arrayCls == nullptr) { TAG_LOGE(AAFwkTag::ANI, "FindClass failed, status : %{public}d", status); return nullptr; } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK || arrayCtor == nullptr) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod failed, status : %{public}d", status); return nullptr; @@ -1524,7 +1524,7 @@ ani_object CreateIntAniArray(ani_env *env, const std::vector &dataArry) return nullptr; } ani_status status = - env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", i, intObj); + env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, intObj); if (status != ANI_OK) { TAG_LOGE( AAFwkTag::ANI, "Object_CallMethodByName_Void failed, status : %{public}d", status); diff --git a/frameworks/ets/ani/ani_common/src/ani_common_want.cpp b/frameworks/ets/ani/ani_common/src/ani_common_want.cpp index e20a297acce56662e97ea1595b70702a7ce9db7e..977699dfaa8b1fb19d908bb11390ae09e6998351 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_want.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_want.cpp @@ -41,10 +41,10 @@ namespace AppExecFwk { using namespace OHOS::AbilityRuntime; using namespace arkts::ani_signature; namespace { -constexpr const char *ABILITY_WANT_CLASS_NAME = "L@ohos/app/ability/Want/Want;"; -constexpr const char *TOOL_CLASS_NAME = "L@ohos/app/ability/Want/RecordSerializeTool;"; -constexpr const char *INNER_CLASS_NAME = "Lability/abilityResult/AbilityResultInner;"; -constexpr const char *ELEMENTNAME_CLASS_NAME = "LbundleManager/ElementNameInner/ElementNameInner;"; +constexpr const char *ABILITY_WANT_CLASS_NAME = "@ohos.app.ability.Want.Want"; +constexpr const char *TOOL_CLASS_NAME = "@ohos.app.ability.Want.RecordSerializeTool"; +constexpr const char *INNER_CLASS_NAME = "ability.abilityResult.AbilityResultInner"; +constexpr const char *ELEMENTNAME_CLASS_NAME = "bundleManager.ElementNameInner.ElementNameInner"; constexpr const char *RECORD_SET_NAME = "X{C{std.core.Numeric}C{std.core.String}C{std.core.BaseEnum}}C{std.core.Object}:"; const int PROPERTIES_SIZE = 2; @@ -83,7 +83,7 @@ bool InnerCreateRecordObject(ani_env *env, ani_object &recordObject) { ani_class recordCls = nullptr; ani_method recordCtorMethod = nullptr; - AniCommonMethodCacheKey recordCtor = std::make_pair("", ":V"); + AniCommonMethodCacheKey recordCtor = std::make_pair("", ":"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_RECORD, recordCtor, recordCls, recordCtorMethod)) { return false; @@ -141,7 +141,7 @@ bool InnerCreateBooleanObject(ani_env *env, ani_boolean value, ani_object &objec { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "Z:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "z:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_BOOLEAN, ctorKey, cls, ctorMethod)) { return false; @@ -203,7 +203,7 @@ bool InnerCreateShortObject(ani_env *env, ani_short value, ani_object &object) { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "S:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "s:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_SHORT, ctorKey, cls, ctorMethod)) { return false; @@ -243,7 +243,7 @@ bool InnerCreateIntObject(ani_env *env, ani_int value, ani_object &object) { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "I:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "i:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_INT, ctorKey, cls, ctorMethod)) { return false; @@ -283,7 +283,7 @@ bool InnerCreateLongObject(ani_env *env, ani_long value, ani_object &object) { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "J:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "l:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_LONG, ctorKey, cls, ctorMethod)) { return false; @@ -323,7 +323,7 @@ bool InnerCreateFloatObject(ani_env *env, ani_float value, ani_object &object) { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "F:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "f:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_FLOAT, ctorKey, cls, ctorMethod)) { return false; @@ -363,7 +363,7 @@ bool InnerCreateDoubleObject(ani_env *env, ani_double value, ani_object &object) { ani_class cls = nullptr; ani_method ctorMethod = nullptr; - AniCommonMethodCacheKey ctorKey = std::make_pair("", "D:V"); + AniCommonMethodCacheKey ctorKey = std::make_pair("", "d:"); if (!AniCommonCacheMgr::GetCachedClassAndMethod(env, CLASSNAME_DOUBLE, ctorKey, cls, ctorMethod)) { return false; @@ -1098,7 +1098,7 @@ ani_object WrapWant(ani_env *env, const AAFwk::Want &want) TAG_LOGE(AAFwkTag::ANI, "null wantCls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "status: %{public}d", status); return nullptr; } @@ -1446,7 +1446,7 @@ ani_object WrapElementName(ani_env *env, const AppExecFwk::ElementName &elementN TAG_LOGE(AAFwkTag::ANI, "FindClass status: %{public}d or null elementNameObj", status); return nullptr; } - if ((status = env->Class_FindMethod(elementNameObj, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(elementNameObj, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod status: %{public}d or null method", status); return nullptr; } diff --git a/frameworks/ets/ani/ani_common/src/ets_application_context_utils.cpp b/frameworks/ets/ani/ani_common/src/ets_application_context_utils.cpp index b6cfd867fdb71a96a78f4a399e0301b229d4c67f..22a45240ec2a4a66327aa3c9ec59c76b646be6bc 100644 --- a/frameworks/ets/ani/ani_common/src/ets_application_context_utils.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_application_context_utils.cpp @@ -29,8 +29,8 @@ namespace OHOS { namespace AbilityRuntime { namespace { static std::once_flag g_bindNativeMethodsFlag; -constexpr const char* ETS_APPLICATION_CONTEXT_CLASS_NAME = "Lapplication/ApplicationContext/ApplicationContext;"; -constexpr const char* CLEANER_CLASS = "Lapplication/ApplicationContext/Cleaner;"; +constexpr const char* ETS_APPLICATION_CONTEXT_CLASS_NAME = "application.ApplicationContext.ApplicationContext"; +constexpr const char* CLEANER_CLASS = "application.ApplicationContext.Cleaner"; constexpr double FOUNT_SIZE = 0.0; constexpr double ERROR_CODE_NULL_ENV = -1; constexpr double ERROR_CODE_NULL_CALLBACK = -2; @@ -970,7 +970,7 @@ ani_object EtsApplicationContextUtils::SetApplicationContext(ani_env* aniEnv, return nullptr; } ani_method method {}; - if ((status = aniEnv->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = aniEnv->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "status: %{public}d", status); return nullptr; } @@ -1015,60 +1015,60 @@ void EtsApplicationContextUtils::BindApplicationContextFunc(ani_env* aniEnv) } std::call_once(g_bindNativeMethodsFlag, [&status, aniEnv, contextClass]() { std::array applicationContextFunctions = { - ani_native_function {"setSupportedProcessCacheSync", "Z:V", + ani_native_function {"setSupportedProcessCacheSync", "z:", reinterpret_cast(EtsApplicationContextUtils::SetSupportedProcessCacheSync)}, - ani_native_function {"nativekillAllProcessesSync", "ZLutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function {"nativekillAllProcessesSync", "zC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::killAllProcesses)}, ani_native_function {"nativepreloadUIExtensionAbilitySync", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::PreloadUIExtensionAbility)}, ani_native_function {"nativeOnLifecycleCallbackSync", - "Lstd/core/String;L@ohos/app/ability/AbilityLifecycleCallback/AbilityLifecycleCallback;:I", + "C{std.core.String}C{@ohos.app.ability.AbilityLifecycleCallback.AbilityLifecycleCallback}:i", reinterpret_cast(EtsApplicationContextUtils::NativeOnLifecycleCallbackSync)}, ani_native_function {"nativeOffLifecycleCallbackSync", - "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::NativeOffLifecycleCallbackSync)}, ani_native_function {"nativegetRunningProcessInformation", - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::GetRunningProcessInformation)}, ani_native_function {"nativeclearUpApplicationData", - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::ClearUpApplicationData)}, - ani_native_function {"nativesetLanguage", "Lstd/core/String;:V", + ani_native_function {"nativesetLanguage", "C{std.core.String}:", reinterpret_cast(EtsApplicationContextUtils::SetLanguage)}, - ani_native_function {"nativesetFontSizeScale", "D:V", + ani_native_function {"nativesetFontSizeScale", "d:", reinterpret_cast(EtsApplicationContextUtils::SetFontSizeScale)}, ani_native_function {"nativesetColorMode", - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/ColorMode;:V", + "C{@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.ColorMode}:", reinterpret_cast(EtsApplicationContextUtils::SetColorMode)}, - ani_native_function {"nativesetFont", "Lstd/core/String;:V", + ani_native_function {"nativesetFont", "C{std.core.String}:", reinterpret_cast(EtsApplicationContextUtils::SetFont)}, - ani_native_function {"nativerestartApp", "L@ohos/app/ability/Want/Want;:V", + ani_native_function {"nativerestartApp", "C{@ohos.app.ability.Want.Want}:", reinterpret_cast(EtsApplicationContextUtils::RestartApp)}, ani_native_function {"nativeOnEnvironmentSync", - "L@ohos/app/ability/EnvironmentCallback/EnvironmentCallback;:I", + "C{@ohos.app.ability.EnvironmentCallback.EnvironmentCallback}:i", reinterpret_cast(EtsApplicationContextUtils::NativeOnEnvironmentSync)}, - ani_native_function {"nativeOffEnvironmentSync", "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function {"nativeOffEnvironmentSync", "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::NativeOffEnvironmentSync)}, ani_native_function {"nativeOnApplicationStateChangeSync", - "L@ohos/app/ability/ApplicationStateChangeCallback/ApplicationStateChangeCallback;:V", + "C{@ohos.app.ability.ApplicationStateChangeCallback.ApplicationStateChangeCallback}:", reinterpret_cast(EtsApplicationContextUtils::NativeOnApplicationStateChangeSync)}, ani_native_function {"nativeOffApplicationStateChangeSync", - "L@ohos/app/ability/ApplicationStateChangeCallback/ApplicationStateChangeCallback;:V", + "C{@ohos.app.ability.ApplicationStateChangeCallback.ApplicationStateChangeCallback}:", reinterpret_cast(EtsApplicationContextUtils::NativeOffApplicationStateChangeSync)}, - ani_native_function {"nativeGetAllRunningInstanceKeys", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function {"nativeGetAllRunningInstanceKeys", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplicationContextUtils::GetAllRunningInstanceKeys)}, - ani_native_function{"nativegetCurrentInstanceKey", ":Lstd/core/String;", + ani_native_function{"nativegetCurrentInstanceKey", ":C{std.core.String}", reinterpret_cast(EtsApplicationContextUtils::GetCurrentInstanceKey)}, - ani_native_function {"nativegetCurrentAppCloneIndex", ":I", + ani_native_function {"nativegetCurrentAppCloneIndex", ":i", reinterpret_cast(EtsApplicationContextUtils::GetCurrentAppCloneIndex)}, ani_native_function {"nativeOnInteropLifecycleCallbackSync", - "Lstd/core/String;L@ohos/app/ability/InteropAbilityLifecycleCallback/" - "InteropAbilityLifecycleCallback;:V", + "C{std.core.String}C{@ohos.app.ability.InteropAbilityLifecycleCallback." + "InteropAbilityLifecycleCallback}:", reinterpret_cast(EtsApplicationContextUtils::NativeOnInteropLifecycleCallbackSync)}, ani_native_function {"nativeOffInteropLifecycleCallbackSync", - "Lstd/core/String;L@ohos/app/ability/InteropAbilityLifecycleCallback/" - "InteropAbilityLifecycleCallback;:V", + "C{std.core.String}C{@ohos.app.ability.InteropAbilityLifecycleCallback." + "InteropAbilityLifecycleCallback}:", reinterpret_cast(EtsApplicationContextUtils::NativeOffInteropLifecycleCallbackSync)}, }; if ((status = aniEnv->Class_BindNativeMethods(contextClass, applicationContextFunctions.data(), diff --git a/frameworks/ets/ani/ani_common/src/ets_application_state_change_callback.cpp b/frameworks/ets/ani/ani_common/src/ets_application_state_change_callback.cpp index 756c8c2f931a92347dda14564e958a18348816e3..0737bca34155767787213076a009aab8c9d0e8e0 100644 --- a/frameworks/ets/ani/ani_common/src/ets_application_state_change_callback.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_application_state_change_callback.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* APPLICATION_STATE_CHANGE_CALLBACK = - "L@ohos/app/ability/ApplicationStateChangeCallback/ApplicationStateChangeCallbackInner;"; + "@ohos.app.ability.ApplicationStateChangeCallback.ApplicationStateChangeCallbackInner"; } EtsApplicationStateChangeCallback::EtsApplicationStateChangeCallback(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/ani_common/src/ets_context_utils.cpp b/frameworks/ets/ani/ani_common/src/ets_context_utils.cpp index 1b4b19140b5909610122e9e8df32496ed0f8c7f4..782def1e016dc45dfb275b3991a26693d0005071 100644 --- a/frameworks/ets/ani/ani_common/src/ets_context_utils.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_context_utils.cpp @@ -35,9 +35,9 @@ namespace AbilityRuntime { namespace ContextUtil { namespace { static std::once_flag g_bindNativeMethodsFlag; -constexpr const char* CONTEXT_CLASS_NAME = "Lapplication/Context/Context;"; -constexpr const char* AREA_MODE_ENUM_NAME = "L@ohos/app/ability/contextConstant/contextConstant/AreaMode;"; -constexpr const char* CLEANER_CLASS = "Lapplication/Context/Cleaner;"; +constexpr const char* CONTEXT_CLASS_NAME = "application.Context.Context"; +constexpr const char* AREA_MODE_ENUM_NAME = "@ohos.app.ability.contextConstant.contextConstant.AreaMode"; +constexpr const char* CLEANER_CLASS = "application.Context.Cleaner"; void BindContextDirInner(ani_env *aniEnv, ani_object contextObj, std::shared_ptr context) @@ -162,7 +162,7 @@ bool SetNativeContextLong(ani_env *env, ani_object aniObj, ani_long nativeContex return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(contextCls, "", ":V", &method)) != ANI_OK || + if ((status = env->Class_FindMethod(contextCls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::APPKIT, "ctor FindMethod status: %{public}d, or null method", status); return false; @@ -172,7 +172,7 @@ bool SetNativeContextLong(ani_env *env, ani_object aniObj, ani_long nativeContex TAG_LOGE(AAFwkTag::APPKIT, "Object_New status: %{public}d, or null contextObj", status); return false; } - if ((status = env->Class_FindMethod(contextCls, "setEtsContextPtr", "J:V", &method)) != ANI_OK || + if ((status = env->Class_FindMethod(contextCls, "setEtsContextPtr", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::APPKIT, "setEtsContextPtr FindMethod status: %{public}d, or null method", status); return false; @@ -263,24 +263,24 @@ void BindNativeFunction(ani_env *aniEnv) ani_status status = ANI_ERROR; std::call_once(g_bindNativeMethodsFlag, [&status, aniEnv, contextCls]() { std::array contextFunctions = { - ani_native_function {"getApplicationContextSync", ":Lapplication/ApplicationContext/ApplicationContext;", + ani_native_function {"getApplicationContextSync", ":C{application.ApplicationContext.ApplicationContext}", reinterpret_cast(ContextUtil::GetApplicationContextSync)}, ani_native_function {"switchArea", nullptr, reinterpret_cast(ContextUtil::SwitchArea)}, ani_native_function {"getArea", nullptr, reinterpret_cast(ContextUtil::GetArea)}, - ani_native_function {"createModuleResourceManagerSync", "Lstd/core/String;Lstd/core/String;" - ":L@ohos/resourceManager/resourceManager/ResourceManager;", + ani_native_function {"createModuleResourceManagerSync", "C{std.core.String}C{std.core.String}" + ":C{@ohos.resourceManager.resourceManager.ResourceManager}", reinterpret_cast(ContextUtil::CreateModuleResourceManagerSync)}, ani_native_function {"nativeGetGroupDir", nullptr, reinterpret_cast(ContextUtil::NativeGetGroupDir)}, - ani_native_function {"nativeCreateDisplayContext", "J:Lapplication/Context/Context;", + ani_native_function {"nativeCreateDisplayContext", "l:C{application.Context.Context}", reinterpret_cast(ContextUtil::NativeCreateDisplayContext)}, ani_native_function {"nativeCreateAreaModeContext", - "L@ohos/app/ability/contextConstant/contextConstant/AreaMode;:Lapplication/Context/Context;", + "C{@ohos.app.ability.contextConstant.contextConstant.AreaMode}:C{application.Context.Context}", reinterpret_cast(ContextUtil::NativeCreateAreaModeContext)}, - ani_native_function {"nativeCreateSystemHspModuleResourceManager", "Lstd/core/String;Lstd/core/String;" - ":L@ohos/resourceManager/resourceManager/ResourceManager;", + ani_native_function {"nativeCreateSystemHspModuleResourceManager", "C{std.core.String}C{std.core.String}" + ":C{@ohos.resourceManager.resourceManager.ResourceManager}", reinterpret_cast(ContextUtil::NativeCreateSystemHspModuleResourceManager)}, }; status = aniEnv->Class_BindNativeMethods(contextCls, contextFunctions.data(), @@ -589,7 +589,7 @@ ani_object CreateContextObject(ani_env* env, ani_class contextClass, std::shared ani_object contextObj = nullptr; ani_method ctorMethod = nullptr; ani_status status = ANI_ERROR; - if ((status = env->Class_FindMethod(contextClass, "", ":V", &ctorMethod)) != ANI_OK) { + if ((status = env->Class_FindMethod(contextClass, "", ":", &ctorMethod)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "Find ctor method failed, status: %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ani_common/src/ets_data_struct_converter.cpp b/frameworks/ets/ani/ani_common/src/ets_data_struct_converter.cpp index 9f273c9c8252e60669641f0b5e648787a18e3250..4289c94d226f48f7c95936f26f70e99fb1887831 100644 --- a/frameworks/ets/ani/ani_common/src/ets_data_struct_converter.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_data_struct_converter.cpp @@ -21,11 +21,11 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *CLASSNAME_LAUNCHPARAM = "L@ohos/app/ability/AbilityConstant/LaunchParamImpl;"; -constexpr const char *CLASSNAME_LAUNCHREASON = "L@ohos/app/ability/AbilityConstant/AbilityConstant/LaunchReason;"; -constexpr const char *CLASSNAME_LAST_EXITREASION = "L@ohos/app/ability/AbilityConstant/AbilityConstant/LastExitReason;"; +constexpr const char *CLASSNAME_LAUNCHPARAM = "@ohos.app.ability.AbilityConstant.LaunchParamImpl"; +constexpr const char *CLASSNAME_LAUNCHREASON = "@ohos.app.ability.AbilityConstant.AbilityConstant.LaunchReason"; +constexpr const char *CLASSNAME_LAST_EXITREASION = "@ohos.app.ability.AbilityConstant.AbilityConstant.LastExitReason"; constexpr const char* LAST_EXIT_DETAIL_INFO_IMPL_CLASS_NAME = - "L@ohos/app/ability/AbilityConstant/LastExitDetailInfoImpl;"; + "@ohos.app.ability.AbilityConstant.LastExitDetailInfoImpl"; ani_string GetAniString(ani_env *env, const std::string &str) { if (env == nullptr) { @@ -54,7 +54,7 @@ ani_object CreateEtsLastExitDetailInfo(ani_env* env, const AAFwk::LastExitDetail return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "status: %{public}d", status); return nullptr; } @@ -127,7 +127,7 @@ bool WrapLaunchParam(ani_env *env, const AAFwk::LaunchParam &launchParam, ani_ob TAG_LOGE(AAFwkTag::ETSRUNTIME, "null cls"); return false; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Failed to find method, status: %{public}d", status); return false; } diff --git a/frameworks/ets/ani/ani_common/src/ets_enviroment_callback.cpp b/frameworks/ets/ani/ani_common/src/ets_enviroment_callback.cpp index 1e911fab720b9c20e6b249a432941cf7868406e0..7f39bca923e59e870f50bb19050d37a46524d9ff 100644 --- a/frameworks/ets/ani/ani_common/src/ets_enviroment_callback.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_enviroment_callback.cpp @@ -24,13 +24,13 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* APPLICATION_ENVIROMENT_CALLBACK = - "L@ohos/app/ability/EnvironmentCallback/EnvironmentCallbackInner;"; + "@ohos.app.ability.EnvironmentCallback.EnvironmentCallbackInner"; constexpr const char* APPLICATION_MEMORYLEVEL = - "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;:V"; + "C{@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel}:"; constexpr const char* APPLICATION_MEMORYLEVEL_ENUM = - "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;"; + "@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel"; constexpr const char* APPLICATION_CONFIGURATION = - "L@ohos/app/ability/Configuration/Configuration;:V"; + "C{@ohos.app.ability.Configuration.Configuration}:"; } EtsEnviromentCallback::EtsEnviromentCallback(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/ani_common/src/ets_error_utils.cpp b/frameworks/ets/ani/ani_common/src/ets_error_utils.cpp index b4beaf864389cd087bb7c43752851dc426248c7e..0fa7a0d4f3a9fc77ddc7149b0dfa7cf0554d542f 100644 --- a/frameworks/ets/ani/ani_common/src/ets_error_utils.cpp +++ b/frameworks/ets/ani/ani_common/src/ets_error_utils.cpp @@ -25,8 +25,8 @@ constexpr const char *ERR_MSG_TOO_FEW_PARAM = "Parameter error. Too few paramete constexpr const char *ERR_MSG_NOT_MAINTHREAD = "Caller error. Caller from non-main thread."; constexpr const char *ERR_MSG_INVALID_NUM_PARAMS = "Parameter error. The number of parameters is invalid."; constexpr const char *NOT_SYSTEM_APP = "The application is not system-app, can not use system-api."; -constexpr const char *BUSINESS_ERROR_CLASS = "L@ohos/base/BusinessError;"; -constexpr const char *ERROR_CLASS_NAME = "Lescompat/Error;"; +constexpr const char *BUSINESS_ERROR_CLASS = "@ohos.base.BusinessError"; +constexpr const char *ERROR_CLASS_NAME = "escompat.Error"; constexpr const char* ERROR_MSG_TRANSFER_CLASS_NOT_FOUND = "Unable to find the class for transferring."; constexpr int32_t ERROR_CODE_TRANSFER_CLASS_NOT_FOUND = 10200067; } // namespace @@ -210,7 +210,7 @@ ani_object EtsErrorUtil::WrapError(ani_env *env, const std::string &msg) return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "Lstd/core/String;Lescompat/ErrorOptions;:V", &method)) != + if ((status = env->Class_FindMethod(cls, "", "C{std.core.String}C{escompat.ErrorOptions}:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod failed %{public}d", status); return nullptr; @@ -236,7 +236,7 @@ ani_object EtsErrorUtil::CreateError(ani_env *env, ani_int code, const std::stri return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "ILescompat/Error;:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "iC{escompat.Error}:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::ANI, "Class_FindMethod failed %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_info_utils.cpp b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_info_utils.cpp index 7993be9dd0429c572ee2cbcd08460c4328f9218f..7224832f8ff99abd8fda8962ccf3d231b7f8683f 100644 --- a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_info_utils.cpp +++ b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_info_utils.cpp @@ -26,7 +26,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char* ETS_MISSION_INFO_NAME = "Lapplication/MissionInfo/MissionInfoInner;"; +constexpr const char* ETS_MISSION_INFO_NAME = "application.MissionInfo.MissionInfoInner"; constexpr const char* KEY_MISSION_ID = "missionId"; constexpr const char* KEY_RUNNING_STATE = "runningState"; constexpr const char* KEY_LOCKED_STATE = "lockedState"; @@ -37,7 +37,7 @@ constexpr const char* KEY_CONTINUABLE = "continuable"; constexpr const char* KEY_ABILITY_STATE = "abilityState"; constexpr const char* KEY_UNCLEARABLE = "unclearable"; constexpr const char* KEY_WANT = "want"; -constexpr const char *SET_OBJECT_VOID_SIGNATURE = "ILstd/core/Object;:V"; +constexpr const char *SET_OBJECT_VOID_SIGNATURE = "iC{std.core.Object}:"; } bool WrapWantInner(ani_env *env, ani_class cls, ani_object object, const AAFwk::Want &want) @@ -106,7 +106,7 @@ ani_object CreateEtsMissionInfo(ani_env *env, const AAFwk::MissionInfo &missionI return nullptr; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "Class_FindMethod ctor failed status: %{public}d, method cls is nullptr", status); return nullptr; @@ -133,14 +133,14 @@ ani_object CreateEtsMissionInfos(ani_env *env, const std::vectorFindClass("Lescompat/Array;", &arrayCls); + status = env->FindClass("escompat.Array", &arrayCls); if (status != ANI_OK || arrayCls == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "FindClass failed, status : %{public}d", status); return nullptr; } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK || arrayCtor == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "Class_FindMethod failed, status : %{public}d", status); return nullptr; diff --git a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_listener.cpp b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_listener.cpp index ac9472671eeb3b40baf55c3e26a679778fb99760..34f96e1cfee7cce32a01d72baaed00d339ffd435 100644 --- a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_listener.cpp +++ b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_listener.cpp @@ -133,7 +133,7 @@ void EtsMissionListener::CallEtsMethod(const std::string &methodName, int32_t mi for (const auto &item : tmpMap) { ani_object etsListenerObj = reinterpret_cast(item.second); ani_status status = ANI_ERROR; - status = env->Object_CallMethodByName_Void(etsListenerObj, methodName.c_str(), "I:V", missionId); + status = env->Object_CallMethodByName_Void(etsListenerObj, methodName.c_str(), "i:", missionId); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::MISSION, "Object_CallMethodByName_Void failed, status: %{public}d", status); } @@ -141,7 +141,7 @@ void EtsMissionListener::CallEtsMethod(const std::string &methodName, int32_t mi for (const auto &item : tmpMapSync) { ani_object etsListenerObj = reinterpret_cast(item.second); ani_status status = ANI_ERROR; - status = env->Object_CallMethodByName_Void(etsListenerObj, methodName.c_str(), "I:V", missionId); + status = env->Object_CallMethodByName_Void(etsListenerObj, methodName.c_str(), "i:", missionId); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::MISSION, "Object_CallMethodByName_Void failed, status: %{public}d", status); } @@ -207,7 +207,7 @@ void EtsMissionListener::OnMissionIconUpdated(int32_t missionId, const std::shar ani_object etsListenerObj = reinterpret_cast(item.second); ani_status status = ANI_ERROR; status = env->Object_CallMethodByName_Void( - etsListenerObj, "onMissionIconUpdated", "IL@ohos/multimedia/image/image/PixelMap;:V", missionId, iconObj); + etsListenerObj, "onMissionIconUpdated", "iC{@ohos.multimedia.image.image.PixelMap}:", missionId, iconObj); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::MISSION, "Object_CallMethodByName_Void failed, status: %{public}d", status); } diff --git a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_manager.cpp b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_manager.cpp index d40fde8f056ac9487fa4400205661a72b2f86967..eefdd7d1418e54bd48c7756f2b4f9e0237233b12 100644 --- a/frameworks/ets/ani/ani_mission_manager/src/ets_mission_manager.cpp +++ b/frameworks/ets/ani/ani_mission_manager/src/ets_mission_manager.cpp @@ -36,8 +36,8 @@ namespace AbilityRuntime { using namespace OHOS::AppExecFwk; using AbilityManagerClient = AAFwk::AbilityManagerClient; namespace { -constexpr const char* ETS_MISSION_INFO_NAME = "Lapplication/MissionInfo/MissionInfoInner;"; -constexpr const char* ETS_MISSION_MANAGER_NAME = "L@ohos/app/ability/missionManager/missionManager;"; +constexpr const char* ETS_MISSION_INFO_NAME = "application.MissionInfo.MissionInfoInner"; +constexpr const char* ETS_MISSION_MANAGER_NAME = "@ohos.app.ability.missionManager.missionManager"; constexpr const char* ON_OFF_TYPE = "mission"; constexpr const char* ON_OFF_TYPE_SYNC = "missionEvent"; } @@ -186,7 +186,7 @@ private: return nullptr; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "Class_FindMethod ctor failed status: %{public}d", status); return nullptr; @@ -322,13 +322,13 @@ private: } ani_class cls = nullptr; ani_status status = ANI_ERROR; - status = env->FindClass("Lapplication/MissionSnapshot/MissionSnapshotImpl;", &cls); + status = env->FindClass("application.MissionSnapshot.MissionSnapshotImpl", &cls); if (status != ANI_OK || cls == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "FindClass failed status = %{public}d", status); return nullptr; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "Class_FindMethod failed status = %{public}d", status); return nullptr; @@ -362,13 +362,13 @@ private: return nullptr; } ani_class cls = nullptr; - ani_status status = env->FindClass("Lapplication/MissionSnapshot/MissionSnapshotImpl;", &cls); + ani_status status = env->FindClass("application.MissionSnapshot.MissionSnapshotImpl", &cls); if (status != ANI_OK || cls == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "find class failed status: %{public}d", status); return nullptr; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::MISSION, "Class_FindMethod ctor failed status: %{public}d", status); return nullptr; @@ -699,69 +699,69 @@ void EtsMissionManagerInit(ani_env *env) } std::array methods = { ani_native_function { - "nativeClearAllMissions", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "nativeClearAllMissions", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::ClearAllMissions) }, ani_native_function { "nativeGetMissionInfo", - "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::GetMissionInfo) }, ani_native_function { "nativeGetMissionInfos", - "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::GetMissionInfos) }, ani_native_function { - "nativeClearMission", "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "nativeClearMission", "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::ClearMission) }, ani_native_function { - "nativeLockMission", "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "nativeLockMission", "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::LockMission) }, ani_native_function { - "nativeUnlockMission", "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "nativeUnlockMission", "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::UnlockMission) }, ani_native_function { "nativeGetMissionSnapShot", - "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::GetMissionSnapShot) }, ani_native_function { "nativeGetLowResolutionMissionSnapShot", - "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::GetLowResolutionMissionSnapShot) }, ani_native_function { "nativeMoveMissionsToBackground", - "Lescompat/Array;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{escompat.Array}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::MoveMissionsToBackground) }, ani_native_function { "nativeMoveMissionsToForeground", - "Lescompat/Array;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{escompat.Array}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::MoveMissionsToForeground) }, ani_native_function { "nativeMoveMissionToFront", - "ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::MoveMissionToFront) }, ani_native_function { "nativeMoveMissionToFront", - "IL@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "iC{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::MoveMissionToFrontWithOptions) }, ani_native_function { "nativeOn", - "Lstd/core/String;Lapplication/MissionListener/MissionListener;:J", + "C{std.core.String}C{application.MissionListener.MissionListener}:l", reinterpret_cast(EtsMissionManager::On) }, ani_native_function { "nativeOff", - "Lstd/core/String;JLutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}lC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsMissionManager::Off) } }; diff --git a/frameworks/ets/ani/ani_wantagent_common/ani_common_want_agent.cpp b/frameworks/ets/ani/ani_wantagent_common/ani_common_want_agent.cpp index 2ab6eeb7f68ad01e92838a225488b9c8647be61e..95ff9c2662668fab14129bd8ff01851d72c04ba5 100644 --- a/frameworks/ets/ani/ani_wantagent_common/ani_common_want_agent.cpp +++ b/frameworks/ets/ani/ani_wantagent_common/ani_common_want_agent.cpp @@ -31,7 +31,7 @@ ani_object CreateWantAgent(ani_env *env, ani_long ptr) return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::WANTAGENT, "Class_FindMethod status: %{public}d, or null method", status); return nullptr; } diff --git a/frameworks/ets/ani/app/ability_context/src/ets_ability_context_module.cpp b/frameworks/ets/ani/app/ability_context/src/ets_ability_context_module.cpp index 246503c434869c411f3dd401869821eae1fb15b7..6a80df17646ae5546274b3996f9245c440267b34 100644 --- a/frameworks/ets/ani/app/ability_context/src/ets_ability_context_module.cpp +++ b/frameworks/ets/ani/app/ability_context/src/ets_ability_context_module.cpp @@ -37,7 +37,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *ETS_ABILITY_CONTEXT_CLASS_NAME = "Lapplication/UIAbilityContext/UIAbilityContext;"; +constexpr const char *ETS_ABILITY_CONTEXT_CLASS_NAME = "application.UIAbilityContext.UIAbilityContext"; } // namespace ani_object EtsAbilityContextModule::NativeTransferStatic(ani_env *aniEnv, ani_object, ani_object input, @@ -325,9 +325,9 @@ void EtsAbilityContextModuleInit(ani_env *aniEnv) } std::array nativeFuncs = { - ani_native_function { "nativeTransferStatic", "Lstd/interop/ESValue;Lstd/core/String;:Lstd/core/Object;", + ani_native_function { "nativeTransferStatic", "C{std.interop.ESValue}C{std.core.String}:C{std.core.Object}", reinterpret_cast(EtsAbilityContextModule::NativeTransferStatic) }, - ani_native_function { "nativeTransferDynamic", "Lstd/core/Object;:Lstd/interop/ESValue;", + ani_native_function { "nativeTransferDynamic", "C{std.core.Object}:C{std.interop.ESValue}", reinterpret_cast(EtsAbilityContextModule::NativeTransferDynamic) }, }; status = aniEnv->Class_BindStaticNativeMethods(abilityContextCls, nativeFuncs.data(), nativeFuncs.size()); diff --git a/frameworks/ets/ani/app/ability_stage_context/src/ets_ability_stage_context_module.cpp b/frameworks/ets/ani/app/ability_stage_context/src/ets_ability_stage_context_module.cpp index cbb16370b47de210211bdb654cbf8146ed342642..56081632402a0bd28147bcf27600c405b3efb1ce 100755 --- a/frameworks/ets/ani/app/ability_stage_context/src/ets_ability_stage_context_module.cpp +++ b/frameworks/ets/ani/app/ability_stage_context/src/ets_ability_stage_context_module.cpp @@ -329,9 +329,9 @@ void EtsAbilityStageContextModuleInit(ani_env *aniEnv) } std::array nativeFuncs = { - ani_native_function { "nativeTransferStatic", "Lstd/interop/ESValue;Lstd/core/String;:Lstd/core/Object;", + ani_native_function { "nativeTransferStatic", "C{std.interop.ESValue}C{std.core.String}:C{std.core.Object}", reinterpret_cast(EtsAbilityStageContextModule::NativeTransferStatic) }, - ani_native_function { "nativeTransferDynamic", "Lstd/core/Object;:Lstd/interop/ESValue;", + ani_native_function { "nativeTransferDynamic", "C{std.core.Object}:C{std.interop.ESValue}", reinterpret_cast(EtsAbilityStageContextModule::NativeTransferDynamic) }, }; status = aniEnv->Class_BindStaticNativeMethods(abilityStageContextCls, nativeFuncs.data(), nativeFuncs.size()); diff --git a/frameworks/ets/ani/app/application_context/src/ets_application_context_module.cpp b/frameworks/ets/ani/app/application_context/src/ets_application_context_module.cpp index e0fc1c0efdc72c30e28bb2f6ba728c7abbe4489a..dbd248256e04faf5771918cdcb134f04dead04fe 100755 --- a/frameworks/ets/ani/app/application_context/src/ets_application_context_module.cpp +++ b/frameworks/ets/ani/app/application_context/src/ets_application_context_module.cpp @@ -41,7 +41,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *ETS_APPLICATION_CONTEXT_CLASS_NAME = "Lapplication/ApplicationContext/ApplicationContext;"; +constexpr const char *ETS_APPLICATION_CONTEXT_CLASS_NAME = "application.ApplicationContext.ApplicationContext"; } // namespace ani_object EtsApplicationContextModule::NativeTransferStatic(ani_env *aniEnv, ani_object self, ani_object input, @@ -373,9 +373,9 @@ void EtsApplicationContextModuleInit(ani_env *aniEnv) } std::array nativeFuncs = { - ani_native_function { "nativeTransferStatic", "Lstd/interop/ESValue;Lstd/core/String;:Lstd/core/Object;", + ani_native_function { "nativeTransferStatic", "C{std.interop.ESValue}C{std.core.String}:C{std.core.Object}", reinterpret_cast(EtsApplicationContextModule::NativeTransferStatic) }, - ani_native_function { "nativeTransferDynamic", "Lstd/core/Object;:Lstd/interop/ESValue;", + ani_native_function { "nativeTransferDynamic", "C{std.core.Object}:C{std.interop.ESValue}", reinterpret_cast(EtsApplicationContextModule::NativeTransferDynamic) }, }; status = aniEnv->Class_BindStaticNativeMethods(applicationContextCls, nativeFuncs.data(), nativeFuncs.size()); diff --git a/frameworks/ets/ani/app/context/src/ets_context_module.cpp b/frameworks/ets/ani/app/context/src/ets_context_module.cpp index ad0a87d388a0cc2df17ee0f9e358f571ddf530a9..4d243bac38d301ee35ddc55747b023a804156a7d 100755 --- a/frameworks/ets/ani/app/context/src/ets_context_module.cpp +++ b/frameworks/ets/ani/app/context/src/ets_context_module.cpp @@ -43,16 +43,16 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *ETS_CONTEXT_CLASS_NAME = "Lapplication/Context/Context;"; +constexpr const char *ETS_CONTEXT_CLASS_NAME = "application.Context.Context"; std::string GetClassNameByContextType(const std::string &contextType) { std::string className; static const std::unordered_map mapping = { - {"Context", "Lapplication/Context/Context;"}, - {"ApplicationContext", "Lapplication/ApplicationContext/ApplicationContext;"}, - {"AbilityStageContext", "Lapplication/AbilityStageContext/AbilityStageContext;"}, - {"UIAbilityContext", "Lapplication/UIAbilityContext/UIAbilityContext;"} + {"Context", "application.Context.Context"}, + {"ApplicationContext", "application.ApplicationContext.ApplicationContext"}, + {"AbilityStageContext", "application.AbilityStageContext.AbilityStageContext"}, + {"UIAbilityContext", "application.UIAbilityContext.UIAbilityContext"} }; auto it = mapping.find(contextType); if (it != mapping.end()) { @@ -357,9 +357,9 @@ void EtsContextModuleInit(ani_env *aniEnv) } std::array nativeFuncs = { - ani_native_function { "nativeTransferStatic", "Lstd/interop/ESValue;Lstd/core/String;:Lstd/core/Object;", + ani_native_function { "nativeTransferStatic", "C{std.interop.ESValue}C{std.core.String}:C{std.core.Object}", reinterpret_cast(EtsContextModule::NativeTransferStatic) }, - ani_native_function { "nativeTransferDynamic", "Lstd/core/Object;:Lstd/interop/ESValue;", + ani_native_function { "nativeTransferDynamic", "C{std.core.Object}:C{std.interop.ESValue}", reinterpret_cast(EtsContextModule::NativeTransferDynamic) }, }; status = aniEnv->Class_BindStaticNativeMethods(contextCls, nativeFuncs.data(), nativeFuncs.size()); @@ -372,7 +372,7 @@ void EtsContextModuleInit(ani_env *aniEnv) [](ani_env *aniEnv, std::shared_ptr context) -> ani_object { ani_class cls {}; ani_status status = ANI_ERROR; - if ((status = aniEnv->FindClass("Lapplication/Context/Context;", &cls)) != ANI_OK) { + if ((status = aniEnv->FindClass("application.Context.Context", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::CONTEXT, "status: %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/app_manager/src/ets_ability_first_frame_state_observer.cpp b/frameworks/ets/ani/app_manager/src/ets_ability_first_frame_state_observer.cpp index af35c5d7bfd5df962839978bb58f2638eedd0c03..63dcdd93993be3bb144aabd1de5d1922a963cb61 100644 --- a/frameworks/ets/ani/app_manager/src/ets_ability_first_frame_state_observer.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_ability_first_frame_state_observer.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* ABILITY_FIRST_FRAME_STATE_OBSERVER_CLASS_NAME = - "Lapplication/AbilityFirstFrameStateObserver/AbilityFirstFrameStateObserver;"; + "application.AbilityFirstFrameStateObserver.AbilityFirstFrameStateObserver"; } ETSAbilityFirstFrameStateObserver::ETSAbilityFirstFrameStateObserver(ani_vm *vm) : etsVm_(vm) {} diff --git a/frameworks/ets/ani/app_manager/src/ets_app_foreground_state_observer.cpp b/frameworks/ets/ani/app_manager/src/ets_app_foreground_state_observer.cpp index 125f9c6b8e9156e87920699830cc1962e0326d37..a455c6f600d5c39a057c26f7a3563f15d2f71f1b 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_foreground_state_observer.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_foreground_state_observer.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* APP_FOREGROUND_STATE_OBSERVER_CLASS_NAME = - "Lapplication/AppForegroundStateObserver/AppForegroundStateObserver;"; + "application.AppForegroundStateObserver.AppForegroundStateObserver"; } ETSAppForegroundStateObserver::ETSAppForegroundStateObserver(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp index 30636affc731bb016529914bf171dd46242a80a7..12872aacb79c6ac84826582bc2a1e80bdafb4fe7 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp @@ -41,33 +41,34 @@ namespace OHOS { namespace AppManagerEts { namespace { constexpr int32_t ERR_FAILURE = -1; -constexpr const char* APP_MANAGER_SPACE_NAME = "L@ohos/app/ability/appManager/appManager;"; +constexpr const char* APP_MANAGER_SPACE_NAME = "@ohos.app.ability.appManager.appManager"; constexpr const char* ON_OFF_TYPE = "applicationState"; constexpr const char* ON_OFF_TYPE_ABILITY_FIRST_FRAME_STATE = "abilityFirstFrameState"; constexpr const char* ON_OFF_TYPE_APP_FOREGROUND_STATE = "appForegroundState"; constexpr const char *APPLICATION_STATE_WITH_BUNDLELIST_ON_SIGNATURE = - "Lstd/core/String;Lapplication/ApplicationStateObserver/ApplicationStateObserver;Lescompat/Array;:I"; + "C{std.core.String}C{application.ApplicationStateObserver.ApplicationStateObserver}C{escompat.Array}:i"; constexpr const char *APPLICATION_STATE_ON_SIGNATURE = - "Lstd/core/String;Lapplication/ApplicationStateObserver/ApplicationStateObserver;:I"; -constexpr const char *APPLICATION_STATE_OFF_SIGNATURE = "Lstd/core/String;ILutils/AbilityUtils/AsyncCallbackWrapper;:V"; -static const char* ON_SIGNATURE_ABILITY_FIRST_FRAME_STATE - = "Lstd/core/String;Lapplication/AbilityFirstFrameStateObserver/AbilityFirstFrameStateObserver;Lstd/core/String;:V"; + "C{std.core.String}C{application.ApplicationStateObserver.ApplicationStateObserver}:i"; +constexpr const char *APPLICATION_STATE_OFF_SIGNATURE = + "C{std.core.String}iC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +static const char* ON_SIGNATURE_ABILITY_FIRST_FRAME_STATE = + "C{std.core.String}C{application.AbilityFirstFrameStateObserver.AbilityFirstFrameStateObserver}C{std.core.String}:"; static const char* ON_SIGNATURE_APP_FOREGROUND_STATE - = "Lstd/core/String;Lapplication/AppForegroundStateObserver/AppForegroundStateObserver;:V"; + = "C{std.core.String}C{application.AppForegroundStateObserver.AppForegroundStateObserver}:"; static const char *OFF_SIGNATURE_ABILITY_FIRST_FRAME_STATE - = "Lstd/core/String;Lapplication/AbilityFirstFrameStateObserver/AbilityFirstFrameStateObserver;:V"; + = "C{std.core.String}C{application.AbilityFirstFrameStateObserver.AbilityFirstFrameStateObserver}:"; static const char *OFF_SIGNATURE_APP_FOREGROUND_STATE - = "Lstd/core/String;Lapplication/AppForegroundStateObserver/AppForegroundStateObserver;:V"; -constexpr const char *BUNDLE_NAME_CHECK_SIG = "Lstd/core/String;:V"; -constexpr const char *CLEAR_UP_APPLICATION_DATA_SIG = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char *GET_KEEP_ALIVE_APP_SERVICE_EXTENSION_SIG = "Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; + = "C{std.core.String}C{application.AppForegroundStateObserver.AppForegroundStateObserver}:"; +constexpr const char *BUNDLE_NAME_CHECK_SIG = "C{std.core.String}:"; +constexpr const char *CLEAR_UP_APPLICATION_DATA_SIG = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char *GET_KEEP_ALIVE_APP_SERVICE_EXTENSION_SIG = "C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char *SET_KEEP_ALIVE_FOR_APP_SERVICE_EXTENSION_SIG = - "Lstd/core/String;ZLutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char *CLEAR_UP_APP_DATA_SIG = "Lutils/AbilityUtils/AsyncCallbackWrapper;" - "Lstd/core/String;Lstd/core/Int;:V"; -constexpr const char *TERMINATION_SIG = "ILutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char *IS_APP_RUNNING_SIG = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{std.core.String}zC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char *CLEAR_UP_APP_DATA_SIG = "C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{std.core.String}C{std.core.Int}:"; +constexpr const char *TERMINATION_SIG = "iC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char *IS_APP_RUNNING_SIG = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; } // namespace class EtsAppManager final { @@ -1627,7 +1628,7 @@ void EtsAppManagerRegistryInit(ani_env *env) reinterpret_cast(EtsAppManager::OnOnApplicationState)}, ani_native_function {"nativeOff", APPLICATION_STATE_OFF_SIGNATURE, reinterpret_cast(EtsAppManager::OnOff)}, - ani_native_function {"nativeOffApplicationStateCheck", "I:V", + ani_native_function {"nativeOffApplicationStateCheck", "i:", reinterpret_cast(EtsAppManager::OffApplicationStateCheck)}, ani_native_function {"nativeGetAppMemorySize", nullptr, reinterpret_cast(EtsAppManager::GetAppMemorySize)}, diff --git a/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp b/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp index fe9386b07e623e584e71ae97fa0c15764244f1c1..287e3fd2f111465b38243a91efc591d7e04cd76f 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp @@ -26,20 +26,20 @@ namespace OHOS { namespace AppManagerEts { namespace { -constexpr const char *DATA_CLASS_NAME = "Lapplication/AppStateData/AppStateData;"; -constexpr const char *CLASSNAME_ARRAY = "Lescompat/Array;"; -constexpr const char *INFO_INNER_CLASS_NAME = "Lapplication/RunningMultiAppInfo/RunningMultiAppInfoInner;"; +constexpr const char *DATA_CLASS_NAME = "application.AppStateData.AppStateData"; +constexpr const char *CLASSNAME_ARRAY = "escompat.Array"; +constexpr const char *INFO_INNER_CLASS_NAME = "application.RunningMultiAppInfo.RunningMultiAppInfoInner"; constexpr const char *INSTANCE_INNER_CLASS_NAME = - "Lapplication/RunningMultiInstanceInfo/RunningMultiInstanceInfoInner;"; -constexpr const char *CLONE_INNER_CLASS_NAME = "Lapplication/RunningAppClone/RunningAppCloneInner;"; -constexpr const char *PROCESS_DATA_CLASS_NAME = "Lapplication/ProcessData/ProcessData;"; -constexpr const char *MULTI_APP_MODE_ENUM_NAME = "Lapplication/MultiAppMode/MultiAppMode;"; -constexpr const char *KEEP_ALIVE_APP_TYPE_ENUM_NAME = "L@ohos/app/ability/appManager/appManager/KeepAliveAppType;"; -constexpr const char *KEEP_ALIVE_APP_SETTER_ENUM_NAME = "L@ohos/app/ability/appManager/appManager/KeepAliveSetter;"; + "application.RunningMultiInstanceInfo.RunningMultiInstanceInfoInner"; +constexpr const char *CLONE_INNER_CLASS_NAME = "application.RunningAppClone.RunningAppCloneInner"; +constexpr const char *PROCESS_DATA_CLASS_NAME = "application.ProcessData.ProcessData"; +constexpr const char *MULTI_APP_MODE_ENUM_NAME = "application.MultiAppMode.MultiAppMode"; +constexpr const char *KEEP_ALIVE_APP_TYPE_ENUM_NAME = "@ohos.app.ability.appManager.appManager.KeepAliveAppType"; +constexpr const char *KEEP_ALIVE_APP_SETTER_ENUM_NAME = "@ohos.app.ability.appManager.appManager.KeepAliveSetter"; constexpr const char *KEEP_ALIVE_BUNDLE_INFO_INNER_CLASS_NAME = - "L@ohos/app/ability/appManager/appManager/KeepAliveBundleInfoInner;"; + "@ohos.app.ability.appManager.appManager.KeepAliveBundleInfoInner"; constexpr const char *ABILITY_FIRST_FRAME_STATE_DATA_CLASS_NAME = - "Lapplication/AbilityFirstFrameStateData/AbilityFirstFrameStateDataInner;"; + "application.AbilityFirstFrameStateData.AbilityFirstFrameStateDataInner"; } // namespace ani_object WrapAppStateData(ani_env *env, const AppExecFwk::AppStateData &appStateData) @@ -60,7 +60,7 @@ ani_object WrapAppStateData(ani_env *env, const AppExecFwk::AppStateData &appSta TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; } @@ -126,7 +126,7 @@ ani_object CreateAppStateDataArray(ani_env *env, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -146,7 +146,7 @@ ani_object CreateAppStateDataArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, aniData); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, aniData); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); break; @@ -171,7 +171,7 @@ ani_object NewArrayClass(ani_env *env, const std::vector &data) } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -192,7 +192,7 @@ ani_object NewArrayClass(ani_env *env, const std::vector &data) TAG_LOGE(AAFwkTag::APPMGR, "String_NewUTF8 failed status : %{public}d", status); break; } - status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, aniString); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, aniString); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "Object_CallMethodByName_Void failed status : %{public}d", status); break; @@ -219,7 +219,7 @@ ani_object CreateEmptyAniArray(ani_env *env) } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", ":V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", ":", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; @@ -252,7 +252,7 @@ ani_object CreateEmptyMultiAppInfo(ani_env *env) TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; } @@ -285,7 +285,7 @@ ani_object CreateRunningMultiInstanceInfoArray(ani_env *env, } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -305,7 +305,7 @@ ani_object CreateRunningMultiInstanceInfoArray(ani_env *env, TAG_LOGE(AAFwkTag::APPMGR, "null ani_info"); break; } - status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, ani_info); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, ani_info); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); break; @@ -332,7 +332,7 @@ ani_object CreateRunningAppCloneArray(ani_env *env, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -352,7 +352,7 @@ ani_object CreateRunningAppCloneArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, ani_info); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, ani_info); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); break; @@ -417,7 +417,7 @@ ani_object WrapRunningMultiAppInfo(ani_env *env, const AppExecFwk::RunningMultiA TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; } @@ -454,7 +454,7 @@ ani_object WrapRunningMultiInstanceInfo(ani_env *env, const AppExecFwk::RunningM TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; } @@ -497,7 +497,7 @@ bool SetRunningMultiInstanceInfo( return false; } ani_method arrayCtor; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return false; @@ -511,7 +511,7 @@ bool SetRunningMultiInstanceInfo( ani_size index = 0; for (auto &pid : instanceInfo.pids) { ani_object aniPid = AppExecFwk::CreateInt(env, pid); - status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, aniPid); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, aniPid); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "set failed status : %{public}d", status); return false; @@ -543,7 +543,7 @@ ani_object WrapRunningAppClone(ani_env *env, const AppExecFwk::RunningAppClone & TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; } @@ -585,7 +585,7 @@ bool SetRunningAppClone(ani_env *env, ani_object object, const AppExecFwk::Runni return false; } ani_method arrayCtor; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return false; @@ -599,7 +599,7 @@ bool SetRunningAppClone(ani_env *env, ani_object object, const AppExecFwk::Runni ani_size index = 0; for (auto &pid : runningAppClone.pids) { ani_object aniPid = AppExecFwk::CreateInt(env, pid); - status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, aniPid); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, aniPid); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "set failed status : %{public}d", status); return false; @@ -632,7 +632,7 @@ ani_object WrapProcessData(ani_env *env, const AppExecFwk::ProcessData &processD TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; } @@ -738,7 +738,7 @@ ani_object CreateIntAniArray(ani_env * env, const std::vector &dataArry } ani_method arrayCtor = nullptr; - status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -757,7 +757,7 @@ ani_object CreateIntAniArray(ani_env * env, const std::vector &dataArry TAG_LOGE(AAFwkTag::APPMGR, "intObj nullptr"); return nullptr; } - ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", i, intObj); + ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, intObj); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "status : %{public}d", status); return nullptr; @@ -816,7 +816,7 @@ ani_object WrapKeepAliveInfo(ani_env *env, const AbilityRuntime::KeepAliveInfo & TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; } @@ -893,7 +893,7 @@ ani_object CreateKeepAliveInfoArray(ani_env *env, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; @@ -912,7 +912,7 @@ ani_object CreateKeepAliveInfoArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, ani_info); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, ani_info); if (status != ANI_OK) { TAG_LOGW(AAFwkTag::APPMGR, "Object_CallMethodByName_Void failed status : %{public}d", status); break; @@ -981,7 +981,7 @@ ani_object WrapAbilityFirstFrameStateData(ani_env *env, TAG_LOGE(AAFwkTag::APPMGR, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "find ctor failed status : %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/app_manager/src/ets_app_state_observer.cpp b/frameworks/ets/ani/app_manager/src/ets_app_state_observer.cpp index b9938226c5d652cd4bf1f65956bf79daed5f1460..f4eaf510df1d76a185d57a5443fc9dc458508994 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_state_observer.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_state_observer.cpp @@ -25,11 +25,11 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *SIGNATURE_APP_STATE_DATA = "Lapplication/AppStateData/AppStateData;:V"; -constexpr const char *SIGNATURE_ABILITY_STATE_DATA = "Lapplication/AbilityStateData/AbilityStateData;:V"; -constexpr const char *SIGNATURE_PROCESS_DATA = "Lapplication/ProcessData/ProcessData;:V"; +constexpr const char *SIGNATURE_APP_STATE_DATA = "C{application.AppStateData.AppStateData}:"; +constexpr const char *SIGNATURE_ABILITY_STATE_DATA = "C{application.AbilityStateData.AbilityStateData}:"; +constexpr const char *SIGNATURE_PROCESS_DATA = "C{application.ProcessData.ProcessData}:"; constexpr const char *CLASS_NAME_APPLIACTION_STATE_OBSERVER = - "Lapplication/ApplicationStateObserver/ApplicationStateObserverImpl;"; + "application.ApplicationStateObserver.ApplicationStateObserverImpl"; } EtsAppStateObserver::EtsAppStateObserver(ani_vm *etsVm) : etsVm_(etsVm) {} diff --git a/frameworks/ets/ani/application/src/ets_application.cpp b/frameworks/ets/ani/application/src/ets_application.cpp index 2af28b9cda3b8003fc761bd9eafc3a2a725831a8..983601bac7faa63e05335d768ddabbd58949a381 100644 --- a/frameworks/ets/ani/application/src/ets_application.cpp +++ b/frameworks/ets/ani/application/src/ets_application.cpp @@ -43,7 +43,7 @@ ani_object CreateEmptyContextObject(ani_env *env) return nullptr; } ani_method method = nullptr; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "Class_FindMethod ctor failed status: %{public}d", status); return nullptr; @@ -350,8 +350,8 @@ void ApplicationInit(ani_env *env) }, ani_native_function { "nativeCreatePluginModuleContext", - "Lapplication/Context/Context;Lstd/core/String;Lstd/core/String;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.Context.Context}C{std.core.String}C{std.core.String}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsApplication::CreatePluginModuleContext) }, ani_native_function { diff --git a/frameworks/ets/ani/apprecovery/src/app_recovery_ani.cpp b/frameworks/ets/ani/apprecovery/src/app_recovery_ani.cpp index 3484e01bc1bc52b8968518958d5f8198d44f3740..f1f898b8dad200f3f736c720eea2ea2a12d186dd 100644 --- a/frameworks/ets/ani/apprecovery/src/app_recovery_ani.cpp +++ b/frameworks/ets/ani/apprecovery/src/app_recovery_ani.cpp @@ -174,7 +174,7 @@ static void EtsAppRecoveryInit(ani_env *env) } ani_namespace ns; - status = env->FindNamespace("L@ohos/app/ability/appRecovery/appRecovery;", &ns); + status = env->FindNamespace("@ohos.app.ability.appRecovery.appRecovery", &ns); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::RECOVERY, "FindNamespace appRecovery failed status: %{public}d", status); return; @@ -183,8 +183,8 @@ static void EtsAppRecoveryInit(ani_env *env) std::array kitFunctions = { ani_native_function {"enableAppRecovery", nullptr, reinterpret_cast(EnableAppRecovery)}, ani_native_function {"restartApp", nullptr, reinterpret_cast(RestartApp)}, - ani_native_function {"saveAppState", ":Z", reinterpret_cast(SaveAppState)}, - ani_native_function {"saveAppState", "Lapplication/UIAbilityContext/UIAbilityContext;:Z", + ani_native_function {"saveAppState", ":z", reinterpret_cast(SaveAppState)}, + ani_native_function {"saveAppState", "C{application.UIAbilityContext.UIAbilityContext}:z", reinterpret_cast(SaveAppStateWithParam)}, ani_native_function {"setRestartWant", nullptr, reinterpret_cast(SetRestartWant)}, }; diff --git a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension.cpp b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension.cpp index ce624de93226c148bd8847a9e60b10491209ab03..15c94a8e3a84a8204d554ab230419902b006df66 100644 --- a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension.cpp +++ b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension.cpp @@ -45,16 +45,16 @@ constexpr static char WANT_PARAMS_AUTO_FILL_EVENT_KEY[] = "ability.want.params.A constexpr const char *WANT_PARAMS_CUSTOM_DATA = "ohos.ability.params.customData"; constexpr const char *WANT_PARAMS_AUTO_FILL_POPUP_WINDOW_KEY = "ohos.ability.params.popupWindow"; constexpr const char *AUTO_FILL_EXTENSION_CLASS_NAME = - "L@ohos/app/ability/AutoFillExtensionAbility/AutoFillExtensionAbility;"; -constexpr const char *ON_REQUEST_METHOD_NAME = "L@ohos/app/ability/Want/Want;I:V"; + "@ohos.app.ability.AutoFillExtensionAbility.AutoFillExtensionAbility"; +constexpr const char *ON_REQUEST_METHOD_NAME = "C{@ohos.app.ability.Want.Want}i:"; constexpr const char *ON_SESSION_DESTROY_METHOD_NAME = - "L@ohos/app/ability/UIExtensionContentSession/UIExtensionContentSession;:V"; + "C{@ohos.app.ability.UIExtensionContentSession.UIExtensionContentSession}:"; constexpr const char *ON_SAVE_REQUEST_METHOD_NAME = - "L@ohos/app/ability/UIExtensionContentSession/UIExtensionContentSession;" - "Lapplication/AutoFillRequest/SaveRequest;Lapplication/AutoFillRequest/SaveRequestCallback;:V"; + "C{@ohos.app.ability.UIExtensionContentSession.UIExtensionContentSession}" + "C{application.AutoFillRequest.SaveRequest;Lapplication.AutoFillRequest.SaveRequestCallback}:"; constexpr const char *ON_FILL_REQUEST_METHOD_NAME = - "L@ohos/app/ability/UIExtensionContentSession/UIExtensionContentSession;" - "Lapplication/AutoFillRequest/FillRequest;Lapplication/AutoFillRequest/FillRequestCallback;:V"; + "C{@ohos.app.ability.UIExtensionContentSession.UIExtensionContentSession}" + "C{application.AutoFillRequest.FillRequest}C{application.AutoFillRequest.FillRequestCallback}:"; } EtsAutoFillExtension *EtsAutoFillExtension::Create(const std::unique_ptr &runtime) @@ -126,7 +126,7 @@ bool EtsAutoFillExtension::BindNativeMethods() return false; } std::array functions = { - ani_native_function { "nativeOnDestroyCallback", ":V", + ani_native_function { "nativeOnDestroyCallback", ":", reinterpret_cast(EtsAutoFillExtension::OnDestroyCallback) }, }; ani_class cls = nullptr; @@ -201,13 +201,13 @@ void EtsAutoFillExtension::BindContext() void EtsAutoFillExtension::OnStart(const AAFwk::Want &want, sptr sessionInfo) { Extension::OnStart(want); - CallObjectMethod(false, "onCreate", ":V"); + CallObjectMethod(false, "onCreate", ":"); } void EtsAutoFillExtension::OnStop() { AutoFillExtension::OnStop(); - CallObjectMethod(false, "onDestroy", ":V"); + CallObjectMethod(false, "onDestroy", ":"); OnStopCallBack(); } @@ -241,7 +241,7 @@ void EtsAutoFillExtension::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> * TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "Object_SetFieldByName_Long failed, status: %{public}d", status); return; } - isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":Z"); + isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":z"); if (!isAsyncCallback) { OnStopCallBack(); } @@ -336,12 +336,12 @@ void EtsAutoFillExtension::OnForeground(const Want &want, sptr &sessionInfo, diff --git a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_context.cpp b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_context.cpp index 634c62e6621a347abf27c0a026ad3e4102a1ab1b..908d4d4d01e2cdb6c700f8564dd4f9b9e1689623 100644 --- a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_context.cpp +++ b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_context.cpp @@ -27,8 +27,8 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* AUTO_FILL_EXTENSION_CONTEXT_CLASS_NAME = - "Lapplication/AutoFillExtensionContext/AutoFillExtensionContext;"; -constexpr const char* CLEANER_CLASS = "Lapplication/AutoFillExtensionContext/Cleaner;"; + "application.AutoFillExtensionContext.AutoFillExtensionContext"; +constexpr const char* CLEANER_CLASS = "application.AutoFillExtensionContext.Cleaner"; } ani_object EtsAutoFillExtensionContext::SetEtsAutoFillExtensionContext(ani_env *env, @@ -45,7 +45,7 @@ ani_object EtsAutoFillExtensionContext::SetEtsAutoFillExtensionContext(ani_env * return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "find method status: %{public}d", status); return nullptr; } @@ -179,7 +179,7 @@ ani_object EtsAutoFillExtensionContext::CreateEtsAutoFillExtensionContext(ani_en } std::array functions = { ani_native_function { "nativeReloadInModal", - "Lapplication/CustomData/CustomData;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{application.CustomData.CustomData}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAutoFillExtensionContext::ReloadInModal) }, }; if ((status = env->Class_BindNativeMethods(cls, functions.data(), functions.size())) != ANI_OK diff --git a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_util.cpp b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_util.cpp index e51c6b405a30656f9ce37193c9722b5c7a44b800..468075c30900455329745ac4dcbec79e6c850718 100644 --- a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_util.cpp +++ b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_auto_fill_extension_util.cpp @@ -24,14 +24,14 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *FILL_REQUEST_CLASS_NAME = "Lapplication/AutoFillRequest/FillRequestInner;"; -constexpr const char *UPDATE_REQUEST_CLASS_NAME = "Lapplication/AutoFillRequest/UpdateRequestInner;"; -constexpr const char *VIEW_DATA_CLASS_NAME = "Lapplication/ViewData/ViewDataImpl;"; -constexpr const char *ARRAY_CLASS_NAME = "Lescompat/Array;"; -constexpr const char *PAGE_NODE_INFO_CLASS_NAME = "Lapplication/PageNodeInfo/PageNodeInfoImpl;"; -constexpr const char *AUTO_FILL_RECT_CLASS_NAME = "Lapplication/AutoFillRect/AutoFillRectImpl;"; -constexpr const char *CUSTOM_DATA_CLASS_NAME = "Lapplication/CustomData/CustomDataInner;"; -constexpr const char *AUTO_FILL_TYPE_ENUM_NAME = "Lapplication/AutoFillType/AutoFillType;"; +constexpr const char *FILL_REQUEST_CLASS_NAME = "application.AutoFillRequest.FillRequestInner"; +constexpr const char *UPDATE_REQUEST_CLASS_NAME = "application.AutoFillRequest.UpdateRequestInner"; +constexpr const char *VIEW_DATA_CLASS_NAME = "application.ViewData.ViewDataImpl"; +constexpr const char *ARRAY_CLASS_NAME = "escompat.Array"; +constexpr const char *PAGE_NODE_INFO_CLASS_NAME = "application.PageNodeInfo.PageNodeInfoImpl"; +constexpr const char *AUTO_FILL_RECT_CLASS_NAME = "application.AutoFillRect.AutoFillRectImpl"; +constexpr const char *CUSTOM_DATA_CLASS_NAME = "application.CustomData.CustomDataInner"; +constexpr const char *AUTO_FILL_TYPE_ENUM_NAME = "application.AutoFillType.AutoFillType"; constexpr const char *VIEW_DATA_BUNDLE_NAME = "bundleName"; constexpr const char *VIEW_DATA_MODULE_NAME = "moduleName"; constexpr const char *VIEW_DATA_ABILITY_NAME = "abilityName"; @@ -315,7 +315,7 @@ bool EtsAutoFillExtensionUtil::CreateObject(ani_env *env, ani_object &object, co return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "status : %{public}d", status); return false; } @@ -451,7 +451,7 @@ void EtsAutoFillExtensionUtil::SetViewDataArray(ani_env *env, ani_object &object return; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "I:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "i:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "status : %{public}d", status); return; } @@ -475,7 +475,7 @@ void EtsAutoFillExtensionUtil::SetViewDataArray(ani_env *env, ani_object &object TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "null etsSubValue"); break; } - if ((status = env->Object_CallMethodByName_Void(object, "$_set", "ILstd/core/Object;:V", index, + if ((status = env->Object_CallMethodByName_Void(object, "$_set", "iC{std.core.Object}:", index, etsSubValue)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "status : %{public}d", status); break; diff --git a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_fill_request_callback.cpp b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_fill_request_callback.cpp index 8caa2077ae7cbc20b9f6bc7eb24b2191d63b679f..234b8267b2231d401cfacb9eb1c4010977ccdaed 100644 --- a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_fill_request_callback.cpp +++ b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_fill_request_callback.cpp @@ -37,8 +37,8 @@ constexpr const char *CONFIG_POPUP_SIZE = "popupSize"; constexpr const char *CONFIG_POPUP_PLACEMENT = "placement"; constexpr const char *WANT_PARAMS_FILL_CONTENT = "ohos.ability.params.fillContent"; constexpr const char *ERROR_MSG_INVALID_EMPTY = "JsonString is empty."; -constexpr const char *FILL_REQUEST_CALL_BACK_CLASS_NAME = "Lapplication/AutoFillRequest/FillRequestCallbackInner;"; -constexpr const char *CLEANER_CLASS = "Lapplication/AutoFillRequest/Cleaner;"; +constexpr const char *FILL_REQUEST_CALL_BACK_CLASS_NAME = "application.AutoFillRequest.FillRequestCallbackInner"; +constexpr const char *CLEANER_CLASS = "application.AutoFillRequest.Cleaner"; } EtsFillRequestCallback::EtsFillRequestCallback( @@ -64,7 +64,7 @@ ani_object EtsFillRequestCallback::SetEtsFillRequestCallback(ani_env *env, sptr< return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "find method status: %{public}d", status); return nullptr; } @@ -315,13 +315,13 @@ ani_object EtsFillRequestCallback::CreateEtsFillRequestCallback(ani_env *env, return nullptr; } std::array functions = { - ani_native_function { "onSuccess", "Lapplication/AutoFillRequest/FillResponse;:V", + ani_native_function { "onSuccess", "C{application.AutoFillRequest.FillResponse}:", reinterpret_cast(EtsFillRequestCallback::FillRequestSuccess) }, - ani_native_function { "onFailure", ":V", + ani_native_function { "onFailure", ":", reinterpret_cast(EtsFillRequestCallback::FillRequestFailed) }, - ani_native_function { "onCancel", "Lstd/core/String;:V", + ani_native_function { "onCancel", "C{std.core.String}:", reinterpret_cast(EtsFillRequestCallback::FillRequestCanceled) }, - ani_native_function { "setAutoFillPopupConfig", "Lapplication/AutoFillPopupConfig/AutoFillPopupConfig;:V", + ani_native_function { "setAutoFillPopupConfig", "C{application.AutoFillPopupConfig.AutoFillPopupConfig}:", reinterpret_cast(EtsFillRequestCallback::FillRequestAutoFillPopupConfig) }, }; if ((status = env->Class_BindNativeMethods(cls, functions.data(), functions.size())) != ANI_OK diff --git a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_save_request_callback.cpp b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_save_request_callback.cpp index 3330d7fa82837949bb7aad40107d69b284c34ff2..050a4064bf2b75748262c982235557e13b6e352a 100644 --- a/frameworks/ets/ani/auto_fill_extension_ability/src/ets_save_request_callback.cpp +++ b/frameworks/ets/ani/auto_fill_extension_ability/src/ets_save_request_callback.cpp @@ -26,8 +26,8 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *SAVE_REQUEST_CALL_BACK_CLASS_NAME = "Lapplication/AutoFillRequest/SaveRequestCallbackInner;"; -constexpr const char *CLEANER_CLASS = "Lapplication/AutoFillRequest/Cleaner;"; +constexpr const char *SAVE_REQUEST_CALL_BACK_CLASS_NAME = "application.AutoFillRequest.SaveRequestCallbackInner"; +constexpr const char *CLEANER_CLASS = "application.AutoFillRequest.Cleaner"; } EtsSaveRequestCallback::EtsSaveRequestCallback( @@ -53,7 +53,7 @@ ani_object EtsSaveRequestCallback::SetEtsSaveRequestCallback(ani_env *env, sptr< return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "find method status: %{public}d", status); return nullptr; } @@ -187,9 +187,9 @@ ani_object EtsSaveRequestCallback::CreateEtsSaveRequestCallback(ani_env *env, return nullptr; } std::array functions = { - ani_native_function { "onSuccess", ":V", + ani_native_function { "onSuccess", ":", reinterpret_cast(EtsSaveRequestCallback::SaveRequestSuccess) }, - ani_native_function { "onFailure", ":V", + ani_native_function { "onFailure", ":", reinterpret_cast(EtsSaveRequestCallback::SaveRequestFailed) }, }; if ((status = env->Class_BindNativeMethods(cls, functions.data(), functions.size())) != ANI_OK diff --git a/frameworks/ets/ani/auto_fill_manager/src/ets_auto_fill_manager.cpp b/frameworks/ets/ani/auto_fill_manager/src/ets_auto_fill_manager.cpp index dcc25b8d54fda7356803cba7ac32c61e4f69cdb4..09962dc1b03fcd756537754aa9a46a40bbae1f72 100644 --- a/frameworks/ets/ani/auto_fill_manager/src/ets_auto_fill_manager.cpp +++ b/frameworks/ets/ani/auto_fill_manager/src/ets_auto_fill_manager.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace AutoFillManagerEts { namespace { -constexpr const char* AUTO_FILL_MANAGER_NAMESPACE = "L@ohos/app/ability/autoFillManager/autoFillManager;"; +constexpr const char* AUTO_FILL_MANAGER_NAMESPACE = "@ohos.app.ability.autoFillManager.autoFillManager"; } // namespace EtsAutoFillManager &EtsAutoFillManager::GetInstance() @@ -147,7 +147,7 @@ void EtsAutoFillManagerInit(ani_env *env) } std::array kitFunctions = {ani_native_function{ "requestAutoSaveWithScope", - "L@ohos/app/ability/autoFillManager/autoFillManager/AutoSaveCallback;:V", + "C{@ohos.app.ability.autoFillManager.autoFillManager.AutoSaveCallback}:", reinterpret_cast(EtsAutoFillManager::RequestAutoSave)}}; status = env->Namespace_BindNativeFunctions(ns, kitFunctions.data(), kitFunctions.size()); if (status != ANI_OK) { diff --git a/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr.cpp b/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr.cpp index b9c42ae43ca5f41ce43fa53e80f09369293a40f1..9050c88f3f6b4e8a61d2d6cba01874ccff413fcd 100644 --- a/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr.cpp +++ b/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr.cpp @@ -35,7 +35,7 @@ namespace AbilityRuntime { using namespace OHOS::AppExecFwk; namespace { constexpr const char* ETS_DELEGATOR_REGISTRY_NAMESPACE = - "L@ohos/app/businessAbilityRouter/businessAbilityRouter;"; + "@ohos.app.businessAbilityRouter.businessAbilityRouter"; const std::string TYPE_BUSINESS_AIBILITY_FILTER = "businessAbilityFilter"; const std::string QUERY_BUSINESS_ABILITY_INFO = "queryBusinessAbilityInfo"; } @@ -111,8 +111,8 @@ void EtsBusinessAbilityRouterInit(ani_env *env) std::array kitFunctions = { ani_native_function {"nativeQueryBusinessAbilityInfos", - "L@ohos/app/businessAbilityRouter/businessAbilityRouter/BusinessAbilityFilter;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.businessAbilityRouter.businessAbilityRouter.BusinessAbilityFilter}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityRouterMgr::QueryBusinessAbilityInfos)}, }; diff --git a/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr_utils.cpp b/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr_utils.cpp index ae4fddeb6a4e79789d333d99039428f1203aa6f3..4628edae43778dbc91a7a836df3087c609601648 100644 --- a/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr_utils.cpp +++ b/frameworks/ets/ani/business_ability_router/src/ets_ability_router_mgr_utils.cpp @@ -24,12 +24,12 @@ namespace AbilityRuntime { using namespace OHOS::AppExecFwk; namespace { constexpr const char* BUSINESS_AIBILITY_INFO_INNER_CLASS_NAME = - "Lapplication/BusinessAbilityInfo/BusinessAbilityInfoInner;"; + "application.BusinessAbilityInfo.BusinessAbilityInfoInner"; constexpr const char* BUSINESS_TYPE_ENUM_NAME = - "L@ohos/app/businessAbilityRouter/businessAbilityRouter/BusinessType;"; + "@ohos.app.businessAbilityRouter.businessAbilityRouter.BusinessType"; constexpr const char* CLASSNAME_APPLICATIONINFO = - "LbundleManager/ApplicationInfoInner/ApplicationInfoInner;"; -constexpr const char *CLASSNAME_ARRAY = "Lescompat/Array;"; + "bundleManager.ApplicationInfoInner.ApplicationInfoInner"; +constexpr const char *CLASSNAME_ARRAY = "escompat.Array"; } bool UnwrapBusinessAbilityFilter(ani_env *env, ani_object param, BusinessAbilityFilter &filter) @@ -99,7 +99,7 @@ ani_object ConvertBusinessAbilityInfos(ani_env *env, const std::vectorClass_FindMethod(arrayCls, "", "I:V", &arrayCtor); + status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::SER_ROUTER, "find ctor failed status : %{public}d", status); return nullptr; @@ -118,7 +118,7 @@ ani_object ConvertBusinessAbilityInfos(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, ani_info); + status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, ani_info); if (status != ANI_OK) { TAG_LOGW(AAFwkTag::SER_ROUTER, "Object_CallMethodByName_Void failed status : %{public}d", status); break; @@ -146,7 +146,7 @@ ani_object ConvertBusinessAbilityInfo(ani_env *env, const BusinessAbilityInfo &i TAG_LOGE(AAFwkTag::SER_ROUTER, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::SER_ROUTER, "find ctor failed status : %{public}d", status); return nullptr; } @@ -240,7 +240,7 @@ ani_object ConvertAppInfo(ani_env *env, const AppInfo &appInfo) TAG_LOGE(AAFwkTag::SER_ROUTER, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::SER_ROUTER, "find ctor failed status : %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/caller_complex/src/ets_caller_complex.cpp b/frameworks/ets/ani/caller_complex/src/ets_caller_complex.cpp index 16983755c594c7acd6308a4c360e7d80d18f85aa..198837aef8f64d09513b2e5af2e3a2cd2eb7cf50 100644 --- a/frameworks/ets/ani/caller_complex/src/ets_caller_complex.cpp +++ b/frameworks/ets/ani/caller_complex/src/ets_caller_complex.cpp @@ -29,7 +29,7 @@ namespace { // nameless using namespace OHOS; using namespace OHOS::AbilityRuntime; -constexpr const char* CALLER_CLASS_NAME = "Lapplication/Caller/CallerImpl;"; +constexpr const char* CALLER_CLASS_NAME = "application.Caller.CallerImpl"; void ReleaseNativeRemote(ani_env *env, ani_ref aniObj) { @@ -131,7 +131,7 @@ ani_object EtsCallerComplex::CreateEtsCaller(ani_env *env, ReleaseCallFunc relea TAG_LOGE(AAFwkTag::UIABILITY, "status : %{public}d", status); return nullptr; } - if ((status = env->FindClass("L@ohos/rpc/rpc/RemoteProxy;", &cls)) != ANI_OK) { + if ((status = env->FindClass("@ohos.rpc.rpc.RemoteProxy", &cls)) != ANI_OK) { TAG_LOGE(AAFwkTag::UIABILITY, "FindClass RemoteProxy: %{public}d", status); return nullptr; } @@ -358,7 +358,7 @@ void CallbackWrap::Invoke(const std::string &msg) const return; } status = aniEnv->Object_CallMethodByName_Void(reinterpret_cast(objectRef), name.c_str(), - "Lstd/core/String;:V", aniMsg); + "C{std.core.String}:", aniMsg); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::UIABILITY, "%{public}s failed %{public}d", name.c_str(), status); } @@ -384,17 +384,24 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) TAG_LOGE(AAFwkTag::UIABILITY, "find class status : %{public}d", status); return ANI_NOT_FOUND; } - std::array functions = { + std::array instanceMethods = { ani_native_function { "nativeReleaseSync", nullptr, reinterpret_cast(EtsCallerComplex::ReleaseCall) }, - ani_native_function { "nativeTransferStatic", "Lstd/interop/ESValue;:Lstd/core/Object;", + }; + status = env->Class_BindNativeMethods(cls, instanceMethods.data(), instanceMethods.size()); + if (status != ANI_OK) { + TAG_LOGE(AAFwkTag::UIABILITY, "bind methods status: %{public}d", status); + return status; + } + std::array staticMethods = { + ani_native_function { "nativeTransferStatic", "C{std.interop.ESValue}:C{std.core.Object}", reinterpret_cast(EtsCallerComplex::NativeTransferStatic) }, - ani_native_function { "nativeTransferDynamic", "Lstd/core/Object;:Lstd/interop/ESValue;", + ani_native_function { "nativeTransferDynamic", "C{std.core.Object}:C{std.interop.ESValue}", reinterpret_cast(EtsCallerComplex::NativeTransferDynamic) }, }; - status = env->Class_BindNativeMethods(cls, functions.data(), functions.size()); + status = env->Class_BindStaticNativeMethods(cls, staticMethods.data(), staticMethods.size()); if (status != ANI_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "bind methods status: %{public}d", status); + TAG_LOGE(AAFwkTag::UIABILITY, "bind static methods status: %{public}d", status); return status; } diff --git a/frameworks/ets/ani/dialog_session/src/ets_dialog_session.cpp b/frameworks/ets/ani/dialog_session/src/ets_dialog_session.cpp index ceb46031157a13eccae04ca9b320caa547edc74d..62834ac2dae79d8aab36ef98d33168b213333f82 100644 --- a/frameworks/ets/ani/dialog_session/src/ets_dialog_session.cpp +++ b/frameworks/ets/ani/dialog_session/src/ets_dialog_session.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char* ETS_DIALOG_SESSION_NAMESPACE = "L@ohos/app/ability/dialogSession/dialogSession;"; +constexpr const char* ETS_DIALOG_SESSION_NAMESPACE = "@ohos.app.ability.dialogSession.dialogSession"; } static void SendDialogResult( diff --git a/frameworks/ets/ani/dialog_session/src/ets_dialog_session_utils.cpp b/frameworks/ets/ani/dialog_session/src/ets_dialog_session_utils.cpp index e34dc1768b2f8f24e8a0cf72ec70b6207e37bf9b..9e64bb3fb2cd2bccfc1ee5ebae7c8055c2b3147b 100644 --- a/frameworks/ets/ani/dialog_session/src/ets_dialog_session_utils.cpp +++ b/frameworks/ets/ani/dialog_session/src/ets_dialog_session_utils.cpp @@ -24,14 +24,14 @@ namespace OHOS { namespace AppExecFwk { -constexpr const char* CLASSNAME_INT = "Lstd/core/Int;"; +constexpr const char* CLASSNAME_INT = "std.core.Int"; constexpr const char* CLASSNAME_BUNDLEMANAGER_MULTIAPPMODE_TYPE = - "L@ohos/bundle/bundleManager/bundleManager/MultiAppModeType;"; + "@ohos.bundle.bundleManager.bundleManager.MultiAppModeType"; constexpr const char* CLASSNAME_DIALOG_ABILITY_INFO = - "L@ohos/app/ability/dialogSession/dialogSession/DialogAbilityInfoInner;"; + "@ohos.app.ability.dialogSession.dialogSession.DialogAbilityInfoInner"; constexpr const char* CLASSNAME_DIALOG_SESSION_INFO = - "L@ohos/app/ability/dialogSession/dialogSession/DialogSessionInfoInner;"; -constexpr const char* CLASSNAME_MULTIAPPMODE = "LbundleManager/ApplicationInfoInner/MultiAppModeInner;"; + "@ohos.app.ability.dialogSession.dialogSession.DialogSessionInfoInner"; +constexpr const char* CLASSNAME_MULTIAPPMODE = "bundleManager.ApplicationInfoInner.MultiAppModeInner"; ani_object WrapArrayDialogAbilityInfoToEts(ani_env *env, const std::vector &value) { ani_object etsValue = nullptr; @@ -153,7 +153,7 @@ ani_object WrapDialogAbilityInfo(ani_env *env, const AAFwk::DialogAbilityInfo &d TAG_LOGE(AAFwkTag::DIALOG, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::DIALOG, "status : %{public}d", status); return nullptr; } @@ -188,7 +188,7 @@ ani_object WrapDialogSessionInfo(ani_env *env, const AAFwk::DialogSessionInfo &d TAG_LOGE(AAFwkTag::DIALOG, "FindClass status : %{public}d or null cls", status); return AppExecFwk::CreateEtsNull(env); } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::DIALOG, "Class_FindMethod status : %{public}d or null method", status); return AppExecFwk::CreateEtsNull(env); } @@ -232,7 +232,7 @@ ani_object WrapMultiAppModeData(ani_env *env, const AppExecFwk::MultiAppModeData TAG_LOGE(AAFwkTag::DIALOG, "FindClass status : %{public}d or null cls", status); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::DIALOG, "Class_FindMethod status : %{public}d or null method", status); return nullptr; } diff --git a/frameworks/ets/ani/event_hub/src/event_hub.cpp b/frameworks/ets/ani/event_hub/src/event_hub.cpp index eb85643f9bb5dbae691ce29d9fe0104dacd43842..90f30badd75efc7dc717755666e2d263e8559492 100644 --- a/frameworks/ets/ani/event_hub/src/event_hub.cpp +++ b/frameworks/ets/ani/event_hub/src/event_hub.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char* ETS_EVENT_HUB_CLASS_NAME = "Lapplication/EventHub/EventHub;"; +constexpr const char* ETS_EVENT_HUB_CLASS_NAME = "application.EventHub.EventHub"; } std::shared_ptr EventHub::GetAbilityContext(ani_env *env, ani_object aniObj) @@ -160,7 +160,7 @@ void EventHub::InitAniEventHub(ani_env *aniEnv) return; } std::array contextFunctions = { - ani_native_function {"getDynamicContextEventHub", ":Lstd/interop/ESValue;", + ani_native_function {"getDynamicContextEventHub", ":C{std.interop.ESValue}", reinterpret_cast(GetDynamicContextEventHub)}, }; aniEnv->Class_BindNativeMethods(contextCls, contextFunctions.data(), diff --git a/frameworks/ets/ani/featureAbility/src/ani_data_ability_helper.cpp b/frameworks/ets/ani/featureAbility/src/ani_data_ability_helper.cpp index f5f9334173d10fbfa5bc3bd07b4fb5773b9ab526..e34314ba34bd77904ddd8291933a76910f586800 100644 --- a/frameworks/ets/ani/featureAbility/src/ani_data_ability_helper.cpp +++ b/frameworks/ets/ani/featureAbility/src/ani_data_ability_helper.cpp @@ -22,10 +22,10 @@ namespace OHOS { namespace AppExecFwk { namespace { -constexpr const char* CLASSNAME_DOUBLE = "Lstd/core/Double;"; -constexpr const char* CLASSNAME_BOOL = "Lstd/core/Boolean;"; -constexpr const char* CLASSNAME_STRING = "Lstd/core/String;"; -constexpr const char* CLASSNAME_ARRAY = "Lescompat/Array;"; +constexpr const char* CLASSNAME_DOUBLE = "std.core.Double"; +constexpr const char* CLASSNAME_BOOL = "std.core.Boolean"; +constexpr const char* CLASSNAME_STRING = "std.core.String"; +constexpr const char* CLASSNAME_ARRAY = "escompat.Array"; } bool IsInstanceOf(ani_env* env, const char* name, ani_object aniValue) diff --git a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp index 91624d9d27857a351632e2593858626f5b007cc6..dd852a91e4bf883cc9de349162e2667932d99c19 100644 --- a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp @@ -37,9 +37,9 @@ namespace { constexpr const char* FORM_BINDING_DATA_CLASS_NAME = "@ohos.app.form.formBindingData.formBindingData.FormBindingDataInner"; constexpr const char* RECORD_CLASS_NAME = "escompat.Record"; -constexpr const char *FORM_LOCATION_STATE_ENUM_NAME = "L@ohos/app/form/formInfo/formInfo/FormLocation;"; +constexpr const char *FORM_LOCATION_STATE_ENUM_NAME = "@ohos.app.form.formInfo.formInfo.FormLocation"; constexpr const char *FORM_LOCATION_CHANGED_STATE_NAME = - "Lstd/core/String;L@ohos/app/form/formInfo/formInfo/FormLocation;:V"; + "C{std.core.String}C{@ohos.app.form.formInfo.formInfo.FormLocation}:"; } using namespace arkts::ani_signature; @@ -605,7 +605,7 @@ bool ETSFormExtension::CreateAndFillRecordObject(ani_env *env, const std::mapClass_FindMethod(recordCls, "$_set", "Lstd/core/Object;Lstd/core/Object;:V", &recordSetMethod); + status = env->Class_FindMethod(recordCls, "$_set", "C{std.core.Object}C{std.core.Object}:", &recordSetMethod); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod set failed: %{public}d", status); return false; @@ -694,7 +694,7 @@ void ETSFormExtension::OnConfigurationUpdated(const AppExecFwk::Configuration &c ani_object aniConfiguration = OHOS::AppExecFwk::WrapConfiguration(env, *fullConfig); ani_method method = nullptr; ani_status status = env->Class_FindMethod(etsAbilityObj_->aniCls, - "onConfigurationUpdate", "L@ohos/app/ability/Configuration/Configuration;:V", &method); + "onConfigurationUpdate", "C{@ohos.app.ability.Configuration.Configuration}:", &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod failed, status: %{public}d", status); return; diff --git a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp index 4738fd384072319c928ff366491ca0087a98ce59..a0fd05ea6d1d444b28f7249854fdd28d048f26e0 100644 --- a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp @@ -31,15 +31,15 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr ani_long ERROR_LONG_VALUE = -1; -constexpr const char *FORM_EXTENSION_CONTEXT_CLASS_NAME = "Lapplication/FormExtensionContext/FormExtensionContext;"; -constexpr const char *CLEANER_CLASS_NAME = "Lapplication/FormExtensionContext/Cleaner;"; +constexpr const char *FORM_EXTENSION_CONTEXT_CLASS_NAME = "application.FormExtensionContext.FormExtensionContext"; +constexpr const char *CLEANER_CLASS_NAME = "application.FormExtensionContext.Cleaner"; constexpr const char *SIGNATURE_START_ABILITY_FORM_EXTENSION = - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char *SIGNATURE_CONNECT_FORM_EXTENSION = - "L@ohos/app/ability/Want/Want;Lability/connectOptions/ConnectOptions;:J"; -constexpr const char *SIGNATURE_DISCONNECT_FORM_EXTENSION = "JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char *SIGNATURE_CHECK_WANT = "L@ohos/app/ability/Want/Want;:V"; -constexpr const char *SIGNATURE_CHECK_CONNECTION = ":V"; + "C{@ohos.app.ability.Want.Want}C{ability.connectOptions.ConnectOptions}:l"; +constexpr const char *SIGNATURE_DISCONNECT_FORM_EXTENSION = "lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char *SIGNATURE_CHECK_WANT = "C{@ohos.app.ability.Want.Want}:"; +constexpr const char *SIGNATURE_CHECK_CONNECTION = ":"; constexpr int32_t ARGC_ONE = 1; constexpr int32_t ARGC_TWO = 2; @@ -391,7 +391,7 @@ ani_object CreateEtsFormExtensionContext(ani_env *env, std::shared_ptrClass_FindMethod(cls, "", "J:V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "Failed to find constructor, status : %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/native_constructor/context_native_constructor.cpp b/frameworks/ets/ani/native_constructor/context_native_constructor.cpp index 5472fc360362ed641109e6e21a6597913daad97a..53c0aabae4e528abe1ffc922484a24432bcd409f 100644 --- a/frameworks/ets/ani/native_constructor/context_native_constructor.cpp +++ b/frameworks/ets/ani/native_constructor/context_native_constructor.cpp @@ -38,13 +38,13 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_ERROR; } ani_class contextClass = nullptr; - static const char *contextClassName = "Lapplication/Context/Context;"; + static const char *contextClassName = "application.Context.Context"; if (ANI_OK != env->FindClass(contextClassName, &contextClass)) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Not found class %{public}s.", contextClassName); return ANI_NOT_FOUND; } std::array classMethodsContext = { - ani_native_function {"", ":V", reinterpret_cast(ContextConstructor)}, + ani_native_function {"", ":", reinterpret_cast(ContextConstructor)}, }; if (ANI_OK != env->Class_BindNativeMethods(contextClass, classMethodsContext.data(), classMethodsContext.size())) { @@ -53,13 +53,13 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) }; ani_class extensionContextClass = nullptr; - static const char *extensionContextClassName = "Lapplication/ExtensionContext/ExtensionContext;"; + static const char *extensionContextClassName = "application.ExtensionContext.ExtensionContext"; if (ANI_OK != env->FindClass(extensionContextClassName, &extensionContextClass)) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Not found class %{public}s.", extensionContextClassName); return ANI_NOT_FOUND; } std::array classMethodsExtensionContext = { - ani_native_function {"", ":V", reinterpret_cast(ExtensionContextConstructor)}, + ani_native_function {"", ":", reinterpret_cast(ExtensionContextConstructor)}, }; if (ANI_OK != env->Class_BindNativeMethods(extensionContextClass, classMethodsExtensionContext.data(), classMethodsExtensionContext.size())) { @@ -68,13 +68,13 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) }; ani_class uiAbilityClass = nullptr; - static const char *uiAbilityClassName = "Lapplication/UIAbilityContext/UIAbilityContext;"; + static const char *uiAbilityClassName = "application.UIAbilityContext.UIAbilityContext"; if (ANI_OK != env->FindClass(uiAbilityClassName, &uiAbilityClass)) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Not found class %{public}s.", uiAbilityClassName); return ANI_NOT_FOUND; } std::array classMethodsUiAbility = { - ani_native_function {"", ":V", reinterpret_cast(UIAbilityContextConstructor)}, + ani_native_function {"", ":", reinterpret_cast(UIAbilityContextConstructor)}, }; if (ANI_OK != env->Class_BindNativeMethods(uiAbilityClass, classMethodsUiAbility.data(), classMethodsUiAbility.size())) { @@ -83,13 +83,13 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) }; ani_class abilityStageContextClass = nullptr; - static const char *abilityStageContextClassName = "Lapplication/AbilityStageContext/AbilityStageContext;"; + static const char *abilityStageContextClassName = "application.AbilityStageContext.AbilityStageContext"; if (ANI_OK != env->FindClass(abilityStageContextClassName, &abilityStageContextClass)) { TAG_LOGE(AAFwkTag::ETSRUNTIME, "Not found class %{public}s.", abilityStageContextClassName); return ANI_NOT_FOUND; } std::array classMethodsAbilityStage = { - ani_native_function {"", ":V", reinterpret_cast(AbilityStageContextConstructor)}, + ani_native_function {"", ":", reinterpret_cast(AbilityStageContextConstructor)}, }; if (ANI_OK != env->Class_BindNativeMethods(abilityStageContextClass, classMethodsAbilityStage.data(), classMethodsAbilityStage.size())) { diff --git a/frameworks/ets/ani/photo_editor_extension_ability/src/ets_photo_editor_extension_context.cpp b/frameworks/ets/ani/photo_editor_extension_ability/src/ets_photo_editor_extension_context.cpp index e3dc517a3dfe439d97b23d5f252a671eef14a5a7..c724a020b285daac8f57ab1dda5ad63c2b7491fe 100644 --- a/frameworks/ets/ani/photo_editor_extension_ability/src/ets_photo_editor_extension_context.cpp +++ b/frameworks/ets/ani/photo_editor_extension_ability/src/ets_photo_editor_extension_context.cpp @@ -38,9 +38,9 @@ constexpr const char *ERR_MSG_PARAMS_ERROR = "Params error"; constexpr const char *ERR_MSG_INTERNAL_ERROR = "Internal error"; constexpr const char* PHOTO_EDITOR_EXTENSION_CONTEXT_CLASS_NAME = - "Lapplication/PhotoEditorExtensionContext/PhotoEditorExtensionContext;"; + "application.PhotoEditorExtensionContext.PhotoEditorExtensionContext"; -constexpr const char* CLEANER_CLASS_NAME = "Lapplication/PhotoEditorExtensionContext/Cleaner;"; +constexpr const char* CLEANER_CLASS_NAME = "application.PhotoEditorExtensionContext.Cleaner"; bool BindNativeMethods(ani_env *env, ani_class &cls) { @@ -120,7 +120,7 @@ ani_object CreateEtsPhotoEditorExtensionContext( return nullptr; } - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::UI_EXT, "Failed to find constructor status: %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/service_extension_ability/src/ets_service_extension.cpp b/frameworks/ets/ani/service_extension_ability/src/ets_service_extension.cpp index c5e26b60281f1aa4d36b0ae67311f08766869379..8e95527f1943cc3aa2bc907a1f52e96e8b32872f 100644 --- a/frameworks/ets/ani/service_extension_ability/src/ets_service_extension.cpp +++ b/frameworks/ets/ani/service_extension_ability/src/ets_service_extension.cpp @@ -42,18 +42,18 @@ namespace AbilityRuntime { using namespace OHOS::AppExecFwk; namespace { constexpr const int ANI_ALREADY_BINDED = 8; -constexpr const char *CLASSNAME_SERVICE_ABILITY = "L@ohos/app/ability/ServiceExtensionAbility/ServiceExtensionAbility;"; +constexpr const char *CLASSNAME_SERVICE_ABILITY = "@ohos.app.ability.ServiceExtensionAbility.ServiceExtensionAbility"; constexpr const char *SERVICE_EXTENSION_CONTEXT_CLASS_NAME = - "Lapplication/ServiceExtensionContext/ServiceExtensionContext;"; -constexpr const char *NATIVE_ONCONNECT_CALLBACK_SIGNATURE = "L@ohos/rpc/rpc/RemoteObject;:Z"; -constexpr const char *ON_CREATE_SIGNATURE = "L@ohos/app/ability/Want/Want;:V"; -constexpr const char *VOID_SIGNATURE = ":V"; -constexpr const char *CHECK_PROMISE_SIGNATURE = "Lstd/core/Object;:Z"; -constexpr const char *CALL_PROMISE_SIGNATURE = "Lstd/core/Promise;:Z"; -constexpr const char *ON_DISCONNECT_SIGNATURE = "L@ohos/app/ability/Want/Want;:Z"; -constexpr const char *ON_REQUEST_SIGNATURE = "L@ohos/app/ability/Want/Want;I:V"; -constexpr const char *ON_CONFIGURATION_UPDATE_SIGNATURE = "L@ohos/app/ability/Configuration/Configuration;:V"; -constexpr const char *ON_DUMP_SIGNATURE = "Lescompat/Array;:Lescompat/Array;"; + "application.ServiceExtensionContext.ServiceExtensionContext"; +constexpr const char *NATIVE_ONCONNECT_CALLBACK_SIGNATURE = "C{@ohos.rpc.rpc.RemoteObject}:z"; +constexpr const char *ON_CREATE_SIGNATURE = "C{@ohos.app.ability.Want.Want}:"; +constexpr const char *VOID_SIGNATURE = ":"; +constexpr const char *CHECK_PROMISE_SIGNATURE = "C{std.core.Object}:z"; +constexpr const char *CALL_PROMISE_SIGNATURE = "C{std.core.Promise}:z"; +constexpr const char *ON_DISCONNECT_SIGNATURE = "C{@ohos.app.ability.Want.Want}:z"; +constexpr const char *ON_REQUEST_SIGNATURE = "C{@ohos.app.ability.Want.Want}i:"; +constexpr const char *ON_CONFIGURATION_UPDATE_SIGNATURE = "C{@ohos.app.ability.Configuration.Configuration}:"; +constexpr const char *ON_DUMP_SIGNATURE = "C{escompat.Array}:C{escompat.Array}"; void DisconnectPromiseCallback(ani_env *env, ani_object aniObj) { diff --git a/frameworks/ets/ani/service_extension_ability/src/ets_service_extension_context.cpp b/frameworks/ets/ani/service_extension_ability/src/ets_service_extension_context.cpp index 5527844d37558d142b88253b7ef0da80e7822641..14eb426ce2c6e0b5daeee1551a1eb7f69320ca46 100644 --- a/frameworks/ets/ani/service_extension_ability/src/ets_service_extension_context.cpp +++ b/frameworks/ets/ani/service_extension_ability/src/ets_service_extension_context.cpp @@ -32,16 +32,16 @@ uint32_t g_serialNumber = 0; static std::mutex g_connectsMutex; static std::map, EtsKeyCompare> g_connects; constexpr const char *SERVICE_EXTENSION_CONTEXT_CLASS_NAME = - "Lapplication/ServiceExtensionContext/ServiceExtensionContext;"; + "application.ServiceExtensionContext.ServiceExtensionContext"; constexpr const char *CLEANER_CLASS_NAME = - "Lapplication/ServiceExtensionContext/Cleaner;"; + "application.ServiceExtensionContext.Cleaner"; constexpr const int ANI_ALREADY_BINDED = 8; constexpr const int FAILED_CODE = -1; constexpr const char *SIGNATURE_CONNECT_SERVICE_EXTENSION = - "L@ohos/app/ability/Want/Want;Lability/connectOptions/ConnectOptions;:J"; -constexpr const char *SIGNATURE_DISCONNECT_SERVICE_EXTENSION = "JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;" - "L@ohos/app/ability/AtomicServiceOptions/AtomicServiceOptions;:V"; + "C{@ohos.app.ability.Want.Want}C{ability.connectOptions.ConnectOptions}:l"; +constexpr const char *SIGNATURE_DISCONNECT_SERVICE_EXTENSION = "lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{@ohos.app.ability.AtomicServiceOptions.AtomicServiceOptions}:"; const std::string ATOMIC_SERVICE_PREFIX = "com.atomicservice."; constexpr int32_t ARGC_ONE = 1; constexpr int32_t ARGC_TWO = 2; @@ -51,19 +51,19 @@ bool BindNativeMethods(ani_env *env, ani_class &cls) { ani_status status = ANI_ERROR; std::array functions = { - ani_native_function { "nativeTerminateSelf", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeTerminateSelf", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsServiceExtensionContext::TerminateSelf) }, ani_native_function { "nativeStartAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsServiceExtensionContext::StartAbility) }, - ani_native_function { "nativeStartAbility", "L@ohos/app/ability/Want/Want;" - "L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeStartAbility", "C{@ohos.app.ability.Want.Want}" + "C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsServiceExtensionContext::StartAbilityWithOption) }, ani_native_function { "nativeStartServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsServiceExtensionContext::StartServiceExtensionAbility) }, ani_native_function { "nativeStopServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsServiceExtensionContext::StopServiceExtensionAbility) }, ani_native_function { "nativeConnectServiceExtensionAbility", SIGNATURE_CONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsServiceExtensionContext::ConnectServiceExtensionAbility) }, @@ -629,7 +629,7 @@ ani_object CreateEtsServiceExtensionContext(ani_env *env, std::shared_ptrClass_FindMethod(cls, "", "J:V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::SERVICE_EXT, "Failed to find constructor, status : %{public}d", status); return nullptr; } diff --git a/frameworks/ets/ani/ui_ability/src/ets_ability_context.cpp b/frameworks/ets/ani/ui_ability/src/ets_ability_context.cpp index 931eb6acdd4cd0dd57460135789aee9af1490978..54f8632cb2237227363c56bc99463d890f30fe50 100644 --- a/frameworks/ets/ani/ui_ability/src/ets_ability_context.cpp +++ b/frameworks/ets/ani/ui_ability/src/ets_ability_context.cpp @@ -56,33 +56,33 @@ constexpr int32_t BASE_REQUEST_CODE_NUM = 10;\ constexpr const int FAILED_CODE = -1; static std::mutex g_connectsMutex; static std::map, EtsKeyCompare> g_connects; -constexpr const char* UI_ABILITY_CONTEXT_CLASS_NAME = "Lapplication/UIAbilityContext/UIAbilityContext;"; -constexpr const char* CLEANER_CLASS = "Lapplication/UIAbilityContext/Cleaner;"; +constexpr const char* UI_ABILITY_CONTEXT_CLASS_NAME = "application.UIAbilityContext.UIAbilityContext"; +constexpr const char* CLEANER_CLASS = "application.UIAbilityContext.Cleaner"; const std::string APP_LINKING_ONLY = "appLinkingOnly"; const std::string JSON_KEY_ERR_MSG = "errMsg"; -constexpr const char* SIGNATURE_OPEN_LINK = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;" - "L@ohos/app/ability/OpenLinkOptions/OpenLinkOptions;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; +constexpr const char* SIGNATURE_OPEN_LINK = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{@ohos.app.ability.OpenLinkOptions.OpenLinkOptions}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char *SIGNATURE_CONNECT_SERVICE_EXTENSION = - "L@ohos/app/ability/Want/Want;Lability/connectOptions/ConnectOptions;:J"; -constexpr const char *SIGNATURE_DISCONNECT_SERVICE_EXTENSION = "JLutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;" - "L@ohos/app/ability/AtomicServiceOptions/AtomicServiceOptions;:V"; + "C{@ohos.app.ability.Want.Want}C{ability.connectOptions.ConnectOptions}:l"; +constexpr const char *SIGNATURE_DISCONNECT_SERVICE_EXTENSION = "lC{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{@ohos.app.ability.AtomicServiceOptions.AtomicServiceOptions}:"; const std::string ATOMIC_SERVICE_PREFIX = "com.atomicservice."; constexpr const char *SIGNATURE_START_ABILITY_BY_TYPE = - "Lstd/core/String;Lescompat/Record;Lapplication/AbilityStartCallback/AbilityStartCallback;:L@ohos/base/" - "BusinessError;"; + "C{std.core.String}C{escompat.Record}C{application.AbilityStartCallback.AbilityStartCallback}:C{@ohos.base." + "BusinessError}"; constexpr const char *SIGNATURE_START_ABILITY_WITH_ACCOUNT = - "L@ohos/app/ability/Want/Want;ILutils/AbilityUtils/AsyncCallbackWrapper;:V"; + "C{@ohos.app.ability.Want.Want}iC{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char *SIGNATURE_START_ABILITY_WITH_ACCOUNT_OPTIONS = - "L@ohos/app/ability/Want/Want;IL@ohos/app/ability/StartOptions/StartOptions;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; -constexpr const char *SIGNATURE_START_ABILITY_AS_CALLER = "L@ohos/app/ability/Want/Want;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;L@ohos/app/ability/StartOptions/StartOptions;:V"; -constexpr const char *SIGNATURE_START_RECENT_ABILITY = "L@ohos/app/ability/Want/Want;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;L@ohos/app/ability/StartOptions/StartOptions;:V"; + "C{@ohos.app.ability.Want.Want}iC{@ohos.app.ability.StartOptions.StartOptions}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:"; +constexpr const char *SIGNATURE_START_ABILITY_AS_CALLER = "C{@ohos.app.ability.Want.Want}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}C{@ohos.app.ability.StartOptions.StartOptions}:"; +constexpr const char *SIGNATURE_START_RECENT_ABILITY = "C{@ohos.app.ability.Want.Want}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}C{@ohos.app.ability.StartOptions.StartOptions}:"; constexpr int32_t ARGC_ONE = 1; constexpr int32_t ARGC_TWO = 2; -constexpr const char* SIGNATURE_RESTORE_WINDOW_STAGE = "Larkui/stateManagement/storage/localStorage/LocalStorage;:V"; +constexpr const char* SIGNATURE_RESTORE_WINDOW_STAGE = "C{arkui.stateManagement.storage.localStorage.LocalStorage}:"; int64_t RequestCodeFromStringToInt64(const std::string &requestCode) { @@ -185,7 +185,7 @@ ani_object EtsAbilityContext::SetEtsAbilityContext(ani_env *env, std::shared_ptr return nullptr; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::CONTEXT, "ctor FindMethod status: %{public}d, or null method", status); return nullptr; @@ -196,7 +196,7 @@ ani_object EtsAbilityContext::SetEtsAbilityContext(ani_env *env, std::shared_ptr return nullptr; } - if ((status = env->Class_FindMethod(cls, "setEtsAbilityContextPtr", "J:V", &method)) != ANI_OK || + if ((status = env->Class_FindMethod(cls, "setEtsAbilityContextPtr", "l:", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::CONTEXT, "setEtsAbilityContextPtr FindMethod status: %{public}d, or null method", status); return nullptr; @@ -2071,83 +2071,83 @@ bool BindNativeMethods(ani_env *env, ani_class &cls) std::call_once(g_bindNativeMethodsFlag, [&status, env, cls]() { std::array functions = { ani_native_function { "nativeStartAbilitySync", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbility) }, ani_native_function { "nativeStartAbilitySync", - "L@ohos/app/ability/Want/Want;L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/" - "AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils." + "AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityWithOptions) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityForResult) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/" - "AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils." + "AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityForResultWithOptions) }, - ani_native_function { "nativeTerminateSelfSync", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeTerminateSelfSync", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::TerminateSelf) }, ani_native_function { "nativeTerminateSelfWithResult", - "Lability/abilityResult/AbilityResult;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{ability.abilityResult.AbilityResult}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::TerminateSelfWithResult) }, ani_native_function { "nativeStartAbilityByCallSync", - "L@ohos/app/ability/Want/Want;:L@ohos/app/ability/UIAbility/Caller;", + "C{@ohos.app.ability.Want.Want}:C{@ohos.app.ability.UIAbility.Caller}", reinterpret_cast(EtsAbilityContext::StartAbilityByCall) }, - ani_native_function { "nativeReportDrawnCompletedSync", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeReportDrawnCompletedSync", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::ReportDrawnCompleted) }, ani_native_function { "nativeStartServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartServiceExtensionAbility) }, ani_native_function { "nativeOpenLink", SIGNATURE_OPEN_LINK, reinterpret_cast(EtsAbilityContext::OpenLink) }, - ani_native_function { "nativeIsTerminating", ":Z", + ani_native_function { "nativeIsTerminating", ":z", reinterpret_cast(EtsAbilityContext::IsTerminating) }, - ani_native_function { "nativeMoveAbilityToBackground", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeMoveAbilityToBackground", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::MoveAbilityToBackground) }, ani_native_function { "nativeRequestModalUIExtension", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::RequestModalUIExtension) }, ani_native_function { "nativeBackToCallerAbilityWithResult", - "Lability/abilityResult/AbilityResult;Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{ability.abilityResult.AbilityResult}C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::BackToCallerAbilityWithResult) }, ani_native_function { "nativeSetMissionLabel", - "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::SetMissionLabel) }, ani_native_function { "nativeConnectServiceExtensionAbility", SIGNATURE_CONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsAbilityContext::ConnectServiceExtensionAbility) }, ani_native_function { "nativeDisconnectServiceExtensionAbility", SIGNATURE_DISCONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsAbilityContext::DisconnectServiceExtensionAbility) }, ani_native_function {"nativeSetColorMode", - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/ColorMode;:V", + "C{@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.ColorMode}:", reinterpret_cast(EtsAbilityContext::SetColorMode)}, ani_native_function { "nativeStartAbilityByTypeSync", SIGNATURE_START_ABILITY_BY_TYPE, reinterpret_cast(EtsAbilityContext::StartAbilityByType) }, ani_native_function { "nativeOpenAtomicService", SIGNATURE_OPEN_ATOMIC_SERVICE, reinterpret_cast(EtsAbilityContext::OpenAtomicService) }, - ani_native_function { "nativeOnSetRestoreEnabled", "Z:V", + ani_native_function { "nativeOnSetRestoreEnabled", "z:", reinterpret_cast(EtsAbilityContext::NativeOnSetRestoreEnabled) }, ani_native_function { "nativeConnectServiceExtensionAbilityWithAccount", - "L@ohos/app/ability/Want/Want;ILability/connectOptions/ConnectOptions;:J", + "C{@ohos.app.ability.Want.Want}iC{ability.connectOptions.ConnectOptions}:l", reinterpret_cast(EtsAbilityContext::ConnectServiceExtensionAbilityWithAccount) }, ani_native_function { "nativeStopServiceExtensionAbilityWithAccount", - "L@ohos/app/ability/Want/Want;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StopServiceExtensionAbilityWithAccount) }, ani_native_function { "nativeStopServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StopServiceExtensionAbility) }, ani_native_function { "nativeStartServiceExtensionAbilityWithAccount", - "L@ohos/app/ability/Want/Want;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartServiceExtensionAbilityWithAccount) }, - ani_native_function { "nativeChangeAbilityVisibility", "ZLutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeChangeAbilityVisibility", "zC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::NativeChangeAbilityVisibility) }, ani_native_function { "nativeConnectAppServiceExtensionAbility", SIGNATURE_CONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsAbilityContext::ConnectAppServiceExtensionAbility) }, ani_native_function { "nativeDisconnectAppServiceExtensionAbility", SIGNATURE_DISCONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsAbilityContext::DisconnectAppServiceExtensionAbility) }, ani_native_function { "nativeStartAppServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAppServiceExtensionAbility) }, ani_native_function { "nativeStopAppServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StopAppServiceExtensionAbility) }, ani_native_function { "nativeStartAbilityWithAccountSync", SIGNATURE_START_ABILITY_WITH_ACCOUNT, reinterpret_cast(EtsAbilityContext::StartAbilityWithAccount) }, @@ -2155,24 +2155,24 @@ bool BindNativeMethods(ani_env *env, ani_class &cls) reinterpret_cast(EtsAbilityContext::StartAbilityWithAccountAndOptions) }, #ifdef SUPPORT_GRAPHICS ani_native_function { "nativeSetAbilityInstanceInfo", - "Lstd/core/String;L@ohos/multimedia/image/image/PixelMap;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}C{@ohos.multimedia.image.image.PixelMap}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::SetAbilityInstanceInfo) }, ani_native_function { "nativeSetMissionIcon", - "L@ohos/multimedia/image/image/PixelMap;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.multimedia.image.image.PixelMap}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::SetMissionIcon) }, #endif - ani_native_function { "nativeRevokeDelegator", "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeRevokeDelegator", "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::RevokeDelegator) }, ani_native_function { "nativeStartAbilityForResultWithAccount", - "L@ohos/app/ability/Want/Want;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityForResultWithAccount) }, ani_native_function { "nativeStartAbilityForResultWithAccountVoid", - "L@ohos/app/ability/Want/Want;IL@ohos/app/ability/StartOptions/StartOptions;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{@ohos.app.ability.StartOptions.StartOptions}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityForResultWithAccountVoid) }, ani_native_function { "nativeStartAbilityForResultWithAccountResult", - "L@ohos/app/ability/Want/Want;IL@ohos/app/ability/StartOptions/StartOptions;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{@ohos.app.ability.StartOptions.StartOptions}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsAbilityContext::StartAbilityForResultWithAccountResult) }, ani_native_function { "nativeRestoreWindowStage", SIGNATURE_RESTORE_WINDOW_STAGE, reinterpret_cast(EtsAbilityContext::RestoreWindowStage) }, diff --git a/frameworks/ets/ani/ui_ability/src/ets_ui_ability.cpp b/frameworks/ets/ani/ui_ability/src/ets_ui_ability.cpp index 7586becf24d83fe58a7ff6f80fd25e73705c0b57..26400762edabf0b65195d3088c60ab959e73cad8 100644 --- a/frameworks/ets/ani/ui_ability/src/ets_ui_ability.cpp +++ b/frameworks/ets/ani/ui_ability/src/ets_ui_ability.cpp @@ -57,12 +57,12 @@ const std::string METHOD_NAME = "WindowScene::GoForeground"; #ifdef SUPPORT_SCREEN constexpr int32_t BASE_DISPLAY_ID_NUM(10); #endif -constexpr const char *UI_ABILITY_CLASS_NAME = "L@ohos/app/ability/UIAbility/UIAbility;"; -constexpr const char *UI_ABILITY_SIGNATURE_VOID = ":V"; -constexpr const char *MEMORY_LEVEL_ENUM_NAME = "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;"; -constexpr const char *ON_SHARE_SIGNATURE = "Lescompat/Record;:V"; +constexpr const char *UI_ABILITY_CLASS_NAME = "@ohos.app.ability.UIAbility.UIAbility"; +constexpr const char *UI_ABILITY_SIGNATURE_VOID = ":"; +constexpr const char *MEMORY_LEVEL_ENUM_NAME = "@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel"; +constexpr const char *ON_SHARE_SIGNATURE = "C{escompat.Record}:"; constexpr const char *ON_COLLABORATE = - "Lescompat/Record;:L@ohos/app/ability/AbilityConstant/AbilityConstant/CollaborateResult;"; + "C{escompat.Record}:C{@ohos.app.ability.AbilityConstant.AbilityConstant.CollaborateResult}"; void OnDestroyPromiseCallback(ani_env *env, ani_object aniObj) { @@ -217,8 +217,8 @@ bool EtsUIAbility::BindNativeMethods() } std::call_once(singletonFlag_, [&status, env, cls]() { std::array functions = { - ani_native_function { "nativeOnDestroyCallback", ":V", reinterpret_cast(OnDestroyPromiseCallback) }, - ani_native_function { "nativeOnPrepareToTerminateCallback", "Z:V", + ani_native_function { "nativeOnDestroyCallback", ":", reinterpret_cast(OnDestroyPromiseCallback) }, + ani_native_function { "nativeOnPrepareToTerminateCallback", "z:", reinterpret_cast(OnPrepareTerminatePromiseCallback) }, }; status = env->Class_BindNativeMethods(cls, functions.data(), functions.size()); @@ -450,7 +450,7 @@ void EtsUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callback TAG_LOGE(AAFwkTag::UIABILITY, "Object_SetFieldByName_Long status: %{public}d", status); return; } - isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":Z"); + isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":z"); TAG_LOGD(AAFwkTag::UIABILITY, "callOnDestroy isAsyncCallback: %{public}d", isAsyncCallback); if (!isAsyncCallback) { OnStopCallback(); diff --git a/frameworks/ets/ani/ui_extension_ability/src/ets_extension_common.cpp b/frameworks/ets/ani/ui_extension_ability/src/ets_extension_common.cpp index 370642eb5e429d2f39ec184559930591759057da..517453dd8d63ca9242a1dd2a56b4a26fe1f651f3 100644 --- a/frameworks/ets/ani/ui_extension_ability/src/ets_extension_common.cpp +++ b/frameworks/ets/ani/ui_extension_ability/src/ets_extension_common.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *MEMORY_LEVEL_ENUM_NAME = "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;"; +constexpr const char *MEMORY_LEVEL_ENUM_NAME = "@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel"; } // namespace using namespace OHOS::AppExecFwk; diff --git a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension.cpp b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension.cpp index 4fe8a65a0d0fa79ca5e24ed9956fe37ec34d3274..4c6a878b05b53c9d470c348dd07262d3751c4fd5 100644 --- a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension.cpp +++ b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension.cpp @@ -49,7 +49,7 @@ namespace OHOS { namespace AbilityRuntime { using namespace OHOS::AppExecFwk; namespace { -constexpr const char* UIEXTENSION_CLASS_NAME = "L@ohos/app/ability/UIExtensionAbility/UIExtensionAbility;"; +constexpr const char* UIEXTENSION_CLASS_NAME = "@ohos.app.ability.UIExtensionAbility.UIExtensionAbility"; void OnDestroyPromiseCallback(ani_env* env, ani_object aniObj) { @@ -152,7 +152,7 @@ bool EtsUIExtension::BindNativeMethods() return false; } std::array functions = { - ani_native_function { "nativeOnDestroyCallback", ":V", reinterpret_cast(OnDestroyPromiseCallback) }, + ani_native_function { "nativeOnDestroyCallback", ":", reinterpret_cast(OnDestroyPromiseCallback) }, }; ani_class cls {}; ani_status status = env->FindClass(UIEXTENSION_CLASS_NAME, &cls); @@ -238,7 +238,7 @@ void EtsUIExtension::OnStart(const AAFwk::Want &want, sptr s EtsExtensionContext::ConfigurationUpdated(env, shellContextRef_, context->GetConfiguration()); } const char *signature = - "L@ohos/app/ability/AbilityConstant/AbilityConstant/LaunchParam;:V"; + "C{@ohos.app.ability.AbilityConstant.AbilityConstant.LaunchParam}:"; auto launchParam = Extension::GetLaunchParam(); if (InsightIntentExecuteParam::IsInsightIntentExecute(want)) { launchParam.launchReason = AAFwk::LaunchReason::LAUNCHREASON_INSIGHT_INTENT; @@ -317,7 +317,7 @@ void EtsUIExtension::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callba TAG_LOGE(AAFwkTag::UI_EXT, "status: %{public}d", status); } - isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":Z"); + isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":z"); if (!isAsyncCallback) { OnStopCallBack(); return; diff --git a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_content_session.cpp b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_content_session.cpp index 97f24c1aaa6531d5e482dd8b2ee088caf59a1da9..43892818d9df98a98bf3eaadf6caf1dcd0aed4a9 100644 --- a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_content_session.cpp +++ b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_content_session.cpp @@ -44,22 +44,22 @@ namespace AbilityRuntime { namespace { constexpr int32_t ERR_FAILURE = -1; const char* UI_EXTENSION_CONTENT_SESSION_CLASS_NAME = - "L@ohos/app/ability/UIExtensionContentSession/UIExtensionContentSession;"; + "@ohos.app.ability.UIExtensionContentSession.UIExtensionContentSession"; const char* UI_EXTENSION_CONTENT_SESSION_CLEANER_CLASS_NAME = - "L@ohos/app/ability/UIExtensionContentSession/Cleaner;"; + "@ohos.app.ability.UIExtensionContentSession.Cleaner"; const std::string UIEXTENSION_TARGET_TYPE_KEY = "ability.want.params.uiExtensionTargetType"; const std::string FLAG_AUTH_READ_URI_PERMISSION = "ability.want.params.uriPermissionFlag"; constexpr const char *SIGNATURE_START_ABILITY_BY_TYPE = - "Lstd/core/String;Lescompat/Record;Lapplication/AbilityStartCallback/AbilityStartCallback;:L@ohos/base/" - "BusinessError;"; + "C{std.core.String}C{escompat.Record}C{application.AbilityStartCallback.AbilityStartCallback}:C{@ohos.base." + "BusinessError}"; constexpr const char *SIGNATURE_GET_UI_EXTENSION_HOST_WINDOW_PROXY = - ":L@ohos/uiExtensionHost/uiExtensionHost/UIExtensionHostWindowProxy;"; + ":C{@ohos.uiExtensionHost.uiExtensionHost.UIExtensionHostWindowProxy}"; constexpr const char *SIGNATURE_GET_UI_EXTENSION_WINDOW_PROXY = - ":L@ohos/arkui/uiExtension/uiExtension/WindowProxy;"; -constexpr const char *SIGNATURE_SET_WINDOW_PRIVACY_MODE = "ZLutils/AbilityUtils/AsyncCallbackWrapper;:V"; + ":C{@ohos.arkui.uiExtension.uiExtension.WindowProxy}"; +constexpr const char *SIGNATURE_SET_WINDOW_PRIVACY_MODE = "zC{utils.AbilityUtils.AsyncCallbackWrapper}:"; constexpr const char* PERMISSION_PRIVACY_WINDOW = "ohos.permission.PRIVACY_WINDOW"; -constexpr const char *SIGNATURE_START_ABILITY_AS_CALLER = "L@ohos/app/ability/Want/Want;" - "Lutils/AbilityUtils/AsyncCallbackWrapper;L@ohos/app/ability/StartOptions/StartOptions;:V"; +constexpr const char *SIGNATURE_START_ABILITY_AS_CALLER = "C{@ohos.app.ability.Want.Want}" + "C{utils.AbilityUtils.AsyncCallbackWrapper}C{@ohos.app.ability.StartOptions.StartOptions}:"; } // namespace void EtsAbilityResultListeners::AddListener(const uint64_t &uiExtensionComponentId, @@ -387,21 +387,21 @@ ani_status EtsUIExtensionContentSession::BindNativeMethod(ani_env *env, ani_clas ani_native_function {"nativeSetWindowPrivacyMode", SIGNATURE_SET_WINDOW_PRIVACY_MODE, reinterpret_cast(EtsUIExtensionContentSession::NativeSetWindowPrivacyMode)}, ani_native_function {"loadContentByName", - "Lstd/core/String;Larkui/stateManagement/storage/localStorage/LocalStorage;:V", + "C{std.core.String}C{arkui.stateManagement.storage.localStorage.LocalStorage}:", reinterpret_cast(EtsUIExtensionContentSession::NativeLoadContentByName)}, ani_native_function { "nativeStartAbilitySync", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContentSession::NativeStartAbility) }, ani_native_function { "nativeStartAbilitySync", - "L@ohos/app/ability/Want/Want;L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/" - "AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils." + "AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContentSession::NativeStartAbilityWithStartOptions) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContentSession::NativeStartAbilityForResult) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/" - "AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils." + "AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContentSession::NativeStartAbilityForResultWithStartOptions) }, ani_native_function {"nativeStartAbilityAsCaller", SIGNATURE_START_ABILITY_AS_CALLER, reinterpret_cast(EtsUIExtensionContentSession::NativeStartAbilityAsCaller)} @@ -431,7 +431,7 @@ ani_object EtsUIExtensionContentSession::CreateEtsUIExtensionContentSession(ani_ return nullptr; } ani_long nativeContextSession = reinterpret_cast(contentSessionPtr.get()); - status = env->Class_FindMethod(cls, "", "J:V", &method); + status = env->Class_FindMethod(cls, "", "l:", &method); if (status != ANI_OK) { return nullptr; } diff --git a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_context.cpp b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_context.cpp index b6a642b218dc87d71702843f9cedd2f1673930f2..be99405054d157fd42a0dc09407ea7c9e6f6bc09 100644 --- a/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_context.cpp +++ b/frameworks/ets/ani/ui_extension_ability/src/ets_ui_extension_context.cpp @@ -44,10 +44,10 @@ constexpr const char *SIGNATURE_DISCONNECT_SERVICE_EXTENSION = "lC{utils.Ability constexpr int32_t ARGC_ONE = 1; constexpr int32_t ARGC_TWO = 2; const std::string JSON_KEY_ERR_MSG = "errMsg"; -constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;" - "L@ohos/app/ability/AtomicServiceOptions/AtomicServiceOptions;:V"; -constexpr const char* SIGNATURE_OPEN_LINK = "Lstd/core/String;Lutils/AbilityUtils/AsyncCallbackWrapper;" - "L@ohos/app/ability/OpenLinkOptions/OpenLinkOptions;Lutils/AbilityUtils/AsyncCallbackWrapper;:V"; +constexpr const char* SIGNATURE_OPEN_ATOMIC_SERVICE = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{@ohos.app.ability.AtomicServiceOptions.AtomicServiceOptions}:"; +constexpr const char* SIGNATURE_OPEN_LINK = "C{std.core.String}C{utils.AbilityUtils.AsyncCallbackWrapper}" + "C{@ohos.app.ability.OpenLinkOptions.OpenLinkOptions}C{utils.AbilityUtils.AsyncCallbackWrapper}:"; const std::string APP_LINKING_ONLY = "appLinkingOnly"; const std::string ATOMIC_SERVICE_PREFIX = "com.atomicservice."; @@ -1103,7 +1103,7 @@ ani_object CreateEtsUIExtensionContext(ani_env *env, std::shared_ptrClass_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::UI_EXT, "status: %{public}d", status); return nullptr; } @@ -1119,39 +1119,39 @@ ani_object CreateEtsUIExtensionContext(ani_env *env, std::shared_ptr(EtsUIExtensionContext::TerminateSelfWithResultSync) }, ani_native_function { "nativeStartAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartAbility) }, - ani_native_function { "nativeStartAbility", "L@ohos/app/ability/Want/Want;L@ohos/app/ability/" - "StartOptions/StartOptions;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + ani_native_function { "nativeStartAbility", "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability." + "StartOptions.StartOptions}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartAbilityWithOption) }, ani_native_function { "nativeConnectServiceExtensionAbility", SIGNATURE_CONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsUIExtensionContext::ConnectServiceExtensionAbility) }, ani_native_function { "nativeDisconnectServiceExtensionAbilitySync", SIGNATURE_DISCONNECT_SERVICE_EXTENSION, reinterpret_cast(EtsUIExtensionContext::DisconnectServiceExtensionAbility) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartAbilityForResult) }, ani_native_function { "nativeStartAbilityForResult", - "L@ohos/app/ability/Want/Want;L@ohos/app/ability/StartOptions/StartOptions;Lutils/AbilityUtils/" - "AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{@ohos.app.ability.StartOptions.StartOptions}C{utils.AbilityUtils." + "AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartAbilityForResultWithOptions) }, ani_native_function { "nativeStartServiceExtensionAbilityWithAccount", - "L@ohos/app/ability/Want/Want;ILutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}iC{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartServiceExtensionAbilityWithAccount) }, ani_native_function { "nativeStartAbilityForResultAsCaller", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;L@ohos/app/" - "ability/StartOptions/StartOptions;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}C{@ohos.app." + "ability.StartOptions.StartOptions}:", reinterpret_cast(EtsUIExtensionContext::StartAbilityForResultAsCaller) }, ani_native_function { "nativeStartServiceExtensionAbility", - "L@ohos/app/ability/Want/Want;Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{@ohos.app.ability.Want.Want}C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::StartServiceExtensionAbility) }, - ani_native_function { "nativeSetHostPageOverlayForbidden", "Z:V", + ani_native_function { "nativeSetHostPageOverlayForbidden", "z:", reinterpret_cast(EtsUIExtensionContext::SetHostPageOverlayForbidden) }, ani_native_function{"setColorMode", - "L@ohos/app/ability/ConfigurationConstant/ConfigurationConstant/ColorMode;:V", + "C{@ohos.app.ability.ConfigurationConstant.ConfigurationConstant.ColorMode}:", reinterpret_cast(EtsUIExtensionContext::SetColorMode)}, ani_native_function{"nativeReportDrawnCompleted", - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(EtsUIExtensionContext::ReportDrawnCompleted)}, ani_native_function { "nativeOpenAtomicService", SIGNATURE_OPEN_ATOMIC_SERVICE, reinterpret_cast(EtsUIExtensionContext::OpenAtomicService) }, diff --git a/frameworks/ets/ani/ui_extension_base/src/ets_ui_extension_base.cpp b/frameworks/ets/ani/ui_extension_base/src/ets_ui_extension_base.cpp index ff676fdba6b21775adafb7b0ae78798239618007..57f24b6157c5c8d11c14747f6a6fed8a582cf34a 100644 --- a/frameworks/ets/ani/ui_extension_base/src/ets_ui_extension_base.cpp +++ b/frameworks/ets/ani/ui_extension_base/src/ets_ui_extension_base.cpp @@ -49,7 +49,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char* UIEXTENSION_CLASS_NAME = "L@ohos/app/ability/UIExtensionAbility/UIExtensionAbility;"; +constexpr const char* UIEXTENSION_CLASS_NAME = "@ohos.app.ability.UIExtensionAbility.UIExtensionAbility"; constexpr const char *UIEXT_ONCREATE_SIGNATURE = "C{@ohos.app.ability.AbilityConstant.AbilityConstant.LaunchParam}:"; constexpr const char *UIEXT_ONSESSIONDESTROY_SIGNATURE = "C{@ohos.app.ability.UIExtensionContentSession.UIExtensionContentSession}:"; @@ -217,7 +217,7 @@ bool EtsUIExtensionBase::BindNativeMethods() return false; } std::array functions = { - ani_native_function { "nativeOnDestroyCallback", ":V", reinterpret_cast(OnDestroyPromiseCallback) }, + ani_native_function { "nativeOnDestroyCallback", ":", reinterpret_cast(OnDestroyPromiseCallback) }, }; ani_class cls {}; ani_status status = env->FindClass(UIEXTENSION_CLASS_NAME, &cls); @@ -358,7 +358,7 @@ void EtsUIExtensionBase::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *ca destroyCallbackPoint)) != ANI_OK) { TAG_LOGE(AAFwkTag::UI_EXT, "status: %{public}d", status); } - isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":Z"); + isAsyncCallback = CallObjectMethod(true, "callOnDestroy", ":z"); if (!isAsyncCallback) { TAG_LOGE(AAFwkTag::UI_EXT, "call promise failed"); OnStopCallBack(); diff --git a/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp b/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp index d76e078079c127472d9293862e3dc5fa7a5728c7..602cf5f240078fcf3a1cec854c8b8e7b7ea9774c 100644 --- a/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp +++ b/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp @@ -31,7 +31,7 @@ constexpr const char* ERROR_MSG_INNER = "Inner error."; #endif // SUPPORT_SCREEN namespace { -constexpr const char *ABILITY_START_CLASS_NAME = "Lapplication/AbilityStartCallback/AbilityStartCallback;"; +constexpr const char *ABILITY_START_CLASS_NAME = "application.AbilityStartCallback.AbilityStartCallback"; } EtsUIExtensionCallback::~EtsUIExtensionCallback() diff --git a/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp b/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp index 1931ee8a81f4803ac1e21294b4650068b6957b3b..bcdb90cbd7a536257a799b87838d209da77ebd41 100644 --- a/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp +++ b/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp @@ -43,7 +43,7 @@ ani_object CreateDouble(ani_env *env, int32_t res) if (env == nullptr) { return nullptr; } - static const char *className = "Lstd/core/Double;"; + static const char *className = "std.core.Double"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { TAG_LOGE(AAFwkTag::URIPERMMGR, "create double error"); @@ -54,7 +54,7 @@ ani_object CreateDouble(ani_env *env, int32_t res) return nullptr; } ani_method ctor; - env->Class_FindMethod(cls, "", "D:V", &ctor); + env->Class_FindMethod(cls, "", "d:", &ctor); if (ctor == nullptr) { return nullptr; } @@ -167,7 +167,7 @@ void EtsUriPermissionManagerInit(ani_env *env) return; } ani_namespace ns; - const char* targetNamespace = "L@ohos/application/uriPermissionManager/uriPermissionManager;"; + const char* targetNamespace = "@ohos.application.uriPermissionManager.uriPermissionManager"; if (env->FindNamespace(targetNamespace, &ns) != ANI_OK) { TAG_LOGE(AAFwkTag::URIPERMMGR, "FindNamespace failed"); } @@ -178,14 +178,14 @@ void EtsUriPermissionManagerInit(ani_env *env) std::array functions = { ani_native_function { "grantUriPermissionCallbackSync", - "Lstd/core/String;L@ohos/app/ability/wantConstant/wantConstant/Flags;Lstd/core/String;I" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}C{@ohos.app.ability.wantConstant.wantConstant.Flags}C{std.core.String}i" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(grantUriPermissionCallbackSync) }, ani_native_function { "revokeUriPermissionCallbackSync", - "Lstd/core/String;Lstd/core/String;I" - "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", + "C{std.core.String}C{std.core.String}i" + "C{utils.AbilityUtils.AsyncCallbackWrapper}:", reinterpret_cast(revokeUriPermissionCallbackSync) }, }; diff --git a/frameworks/ets/ani/want/src/ani_want_module.cpp b/frameworks/ets/ani/want/src/ani_want_module.cpp index 53574f693216e13fc8117672f6ea7bd34d5c73d2..b1291dbe5a0d23321d6b29cfe5ce81309208be7d 100644 --- a/frameworks/ets/ani/want/src/ani_want_module.cpp +++ b/frameworks/ets/ani/want/src/ani_want_module.cpp @@ -30,8 +30,8 @@ namespace OHOS::AppExecFwk { namespace { -constexpr const char *ETS_NATIVE_WANT_PARAMS_CLASS_NAME = "L@ohos/app/ability/Want/NativeWantParams;"; -constexpr const char *ETS_NATIVE_WANT_PARAMS_CLEANER_CLASS_NAME = "L@ohos/app/ability/Want/NativeWantParamsCleaner;"; +constexpr const char *ETS_NATIVE_WANT_PARAMS_CLASS_NAME = "@ohos.app.ability.Want.NativeWantParams"; +constexpr const char *ETS_NATIVE_WANT_PARAMS_CLEANER_CLASS_NAME = "@ohos.app.ability.Want.NativeWantParamsCleaner"; } // namespace ani_ref g_booleanCls {}; @@ -352,7 +352,7 @@ bool EtsWantParams::SetArrayString(ani_env *env, const std::string &key, ani_obj for (int i = 0; i < length; i++) { ani_ref itemRef; - status = env->Object_CallMethodByName_Ref(value, "$_get", "I:Lstd/core/Object;", &itemRef, i); + status = env->Object_CallMethodByName_Ref(value, "$_get", "i:C{std.core.Object}", &itemRef, i); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::WANT, "status: %{public}d, index: %{public}d", status, i); return false; @@ -810,63 +810,63 @@ ani_status BindNativeFunctions(ani_env *aniEnv) std::array nativeFuncs = { ani_native_function{ - "nativeCreate", ":J", + "nativeCreate", ":l", reinterpret_cast(EtsWantParams::NativeCreate) }, ani_native_function{ - "nativeSetStringParam", "JLstd/core/String;Lstd/core/String;:Z", + "nativeSetStringParam", "lC{std.core.String}C{std.core.String}:z", reinterpret_cast(EtsWantParams::NativeSetStringParam) }, ani_native_function{ - "nativeSetDoubleParam", "JLstd/core/String;D:Z", + "nativeSetDoubleParam", "lC{std.core.String}d:z", reinterpret_cast(EtsWantParams::NativeSetDoubleParam) }, ani_native_function{ - "nativeSetIntParam", "JLstd/core/String;I:Z", + "nativeSetIntParam", "lC{std.core.String}i:z", reinterpret_cast(EtsWantParams::NativeSetIntParam) }, ani_native_function{ - "nativeSetLongParam", "JLstd/core/String;J:Z", + "nativeSetLongParam", "lC{std.core.String}l:z", reinterpret_cast(EtsWantParams::NativeSetLongParam) }, ani_native_function{ - "nativeSetBooleanParam", "JLstd/core/String;Z:Z", + "nativeSetBooleanParam", "lC{std.core.String}z:z", reinterpret_cast(EtsWantParams::NativeSetBooleanParam) }, ani_native_function{ - "nativeSetWantParams", "JLstd/core/String;J:Z", + "nativeSetWantParams", "lC{std.core.String}l:z", reinterpret_cast(EtsWantParams::NativeSetWantParams) }, ani_native_function{ - "nativeSetArrayStringParam", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayStringParam", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayStringParam) }, ani_native_function{ - "nativeSetArrayDoubleParam", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayDoubleParam", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayDoubleParam) }, ani_native_function{ - "nativeSetArrayIntParam", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayIntParam", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayIntParam) }, ani_native_function{ - "nativeSetArrayLongParam", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayLongParam", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayLongParam) }, ani_native_function{ - "nativeSetArrayBooleanParam", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayBooleanParam", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayBooleanParam) }, ani_native_function{ - "nativeSetArrayWantParams", "JLstd/core/String;Lescompat/Array;:Z", + "nativeSetArrayWantParams", "lC{std.core.String}C{escompat.Array}:z", reinterpret_cast(EtsWantParams::NativeSetArrayWantParams) }, ani_native_function{ - "nativeSetRemoteObjectParam", "JLstd/core/String;L@ohos/rpc/rpc/RemoteObject;:Z", + "nativeSetRemoteObjectParam", "lC{std.core.String}C{@ohos.rpc.rpc.RemoteObject}:z", reinterpret_cast(EtsWantParams::NativeSetRemoteObjectParam) }, }; - status = aniEnv->Class_BindNativeMethods(nativeWantParamsCls, nativeFuncs.data(), nativeFuncs.size()); + status = aniEnv->Class_BindStaticNativeMethods(nativeWantParamsCls, nativeFuncs.data(), nativeFuncs.size()); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::WANT, "Class_BindNativeMethods failed status: %{public}d", status); return status; @@ -880,7 +880,7 @@ ani_status BindNativeFunctions(ani_env *aniEnv) } std::array cleanerNativeFuncs = { ani_native_function{ - "nativeDestroy", "J:V", + "nativeDestroy", "l:", reinterpret_cast(EtsWantParams::NativeDestroy) }, }; diff --git a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp index 34dcc150e4ab4af47a5ff244dc82c274a198c73f..705086ec3a825559110d3b5f943fca449d7ff690 100644 --- a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp +++ b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp @@ -32,9 +32,9 @@ namespace { constexpr int32_t ERR_NOT_OK = -1; constexpr int32_t BUSINESS_ERROR_CODE_OK = 0; constexpr int32_t PARAMETER_ERROR = -1; -constexpr const char* COMPLETE_DATA_IMPL_CLASS_NAME = "L@ohos/app/ability/wantAgent/wantAgent/CompleteDataImpl;"; -constexpr const char* WANT_AGENT_NAMESPACE = "L@ohos/app/ability/wantAgent/wantAgent;"; -constexpr const char* CLEANER_CLASS = "L@ohos/app/ability/wantAgent/wantAgent/Cleaner;"; +constexpr const char* COMPLETE_DATA_IMPL_CLASS_NAME = "@ohos.app.ability.wantAgent.wantAgent.CompleteDataImpl"; +constexpr const char* WANT_AGENT_NAMESPACE = "@ohos.app.ability.wantAgent.wantAgent"; +constexpr const char* CLEANER_CLASS = "@ohos.app.ability.wantAgent.wantAgent.Cleaner"; } // namespace TriggerCompleteCallBack::TriggerCompleteCallBack() @@ -81,7 +81,7 @@ bool OnSendFinishedCallback(TriggerReceiveDataWorker *dataWorker) return false; } ani_method method = nullptr; - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK || method == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK || method == nullptr) { TAG_LOGE(AAFwkTag::WANTAGENT, "Class_FindMethod failed status: %{public}d, or null method", status); return false; } diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/ets_auto_fill_extension_util.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/ets_auto_fill_extension_util.cpp index ee3405f5d72bbe7f0bfc282816b57a3de8bc831e..cf9a20df063ce54650f3a831ec8bf2e7a44482fb 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/ets_auto_fill_extension_util.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/ets_auto_fill_extension_util.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace AbilityRuntime { using namespace OHOS::AppExecFwk; -constexpr const char* CUSTOM_DATA_INNER_CLASS_NAME = "Lapplication/CustomData/CustomDataInner;"; +constexpr const char* CUSTOM_DATA_INNER_CLASS_NAME = "application.CustomData.CustomDataInner"; ani_object EtsAutoFillExtensionUtil::WrapCustomData(ani_env *env, const CustomData &customdata) { @@ -46,7 +46,7 @@ ani_object EtsAutoFillExtensionUtil::WrapCustomData(ani_env *env, const CustomDa TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "null cls"); return nullptr; } - if ((status = env->Class_FindMethod(cls, "", ":V", &ctor)) != ANI_OK || ctor == nullptr) { + if ((status = env->Class_FindMethod(cls, "", ":", &ctor)) != ANI_OK || ctor == nullptr) { TAG_LOGE(AAFwkTag::AUTOFILL_EXT, "Class_FindMethod status: %{public}d or null ctor", status); return nullptr; } diff --git a/frameworks/native/ability/native/insight_intent_executor/ets_insight_intent_executor.cpp b/frameworks/native/ability/native/insight_intent_executor/ets_insight_intent_executor.cpp index 07e946a5fd4786a4654422489c7fb3b3fc5c5c78..0fd53ebb9d7a5d0fb922f50928d9fd665f4b0b9e 100644 --- a/frameworks/native/ability/native/insight_intent_executor/ets_insight_intent_executor.cpp +++ b/frameworks/native/ability/native/insight_intent_executor/ets_insight_intent_executor.cpp @@ -34,7 +34,7 @@ namespace OHOS { namespace AbilityRuntime { using State = EtsInsightIntentExecutor::State; namespace { -constexpr const char *EXECUTOR_CLASS_NAME = "L@ohos/app/ability/InsightIntentExecutor/InsightIntentExecutor;"; +constexpr const char *EXECUTOR_CLASS_NAME = "@ohos.app.ability.InsightIntentExecutor.InsightIntentExecutor"; } InsightIntentExecutor *EtsInsightIntentExecutor::Create(Runtime &runtime) { diff --git a/frameworks/native/appkit/ability_runtime/app/ets_ability_stage.cpp b/frameworks/native/appkit/ability_runtime/app/ets_ability_stage.cpp index 70becee473b14702792df9985436d7cc2f042f38..4b46e331cff2a64673788b632d3dac89a2ba41f5 100644 --- a/frameworks/native/appkit/ability_runtime/app/ets_ability_stage.cpp +++ b/frameworks/native/appkit/ability_runtime/app/ets_ability_stage.cpp @@ -44,13 +44,13 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char* CALLBACK_SUCCESS = "success"; -constexpr const char* ABILITY_STAGE_CLASS_NAME = "L@ohos/app/ability/AbilityStage/AbilityStage;"; -constexpr const char* ABILITY_STAGE_SYNC_METHOD_NAME = "L@ohos/app/ability/Want/Want;:Lstd/core/String;"; -constexpr const char* ABILITY_STAGE_ASYNC_METHOD_NAME = "L@ohos/app/ability/Want/Want;:Z"; +constexpr const char* ABILITY_STAGE_CLASS_NAME = "@ohos.app.ability.AbilityStage.AbilityStage"; +constexpr const char* ABILITY_STAGE_SYNC_METHOD_NAME = "C{@ohos.app.ability.Want.Want}:C{std.core.String}"; +constexpr const char* ABILITY_STAGE_ASYNC_METHOD_NAME = "C{@ohos.app.ability.Want.Want}:z"; constexpr const char* MEMORY_LEVEL_ENUM_NAME = - "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;"; + "@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel"; constexpr const char *PREPARE_TERMINATION_CLASS_NAME = - ":L@ohos/app/ability/AbilityConstant/AbilityConstant/PrepareTermination;"; + ":C{@ohos.app.ability.AbilityConstant.AbilityConstant.PrepareTermination}"; void OnPrepareTerminatePromiseCallback(ani_env* env, ani_object aniObj, ani_object dataObj) { @@ -173,7 +173,7 @@ void ETSAbilityStage::OnCreate(const AAFwk::Want &want) const AbilityStage::OnCreate(want); FreezeUtil::GetInstance().AddAppLifecycleEvent(0, "ETSAbilityStage::OnCreate begin"); - CallObjectMethod(false, "onCreate", ":V"); + CallObjectMethod(false, "onCreate", ":"); FreezeUtil::GetInstance().AddAppLifecycleEvent(0, "ETSAbilityStage::OnCreate end"); auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(AbilityRuntime::Runtime::Language::ETS); @@ -186,7 +186,7 @@ void ETSAbilityStage::OnDestroy() const { TAG_LOGD(AAFwkTag::APPKIT, "OnDestroy called"); AbilityStage::OnDestroy(); - CallObjectMethod(false, "onDestroy", ":V"); + CallObjectMethod(false, "onDestroy", ":"); } std::string ETSAbilityStage::OnAcceptWant(const AAFwk::Want &want, @@ -361,7 +361,7 @@ void ETSAbilityStage::OnConfigurationUpdated(const AppExecFwk::Configuration &co TAG_LOGE(AAFwkTag::APPKIT, "null configObj"); return; } - CallObjectMethod(false, "onConfigurationUpdate", "L@ohos/app/ability/Configuration/Configuration;:V", configObj); + CallObjectMethod(false, "onConfigurationUpdate", "C{@ohos.app.ability.Configuration.Configuration}:", configObj); } void ETSAbilityStage::OnMemoryLevel(int32_t level) @@ -378,7 +378,7 @@ void ETSAbilityStage::OnMemoryLevel(int32_t level) OHOS::AAFwk::AniEnumConvertUtil::EnumConvert_NativeToEts(env, MEMORY_LEVEL_ENUM_NAME, level, memoryLevelItem); - CallObjectMethod(false, "onMemoryLevel", "L@ohos/app/ability/AbilityConstant/AbilityConstant/MemoryLevel;:V", + CallObjectMethod(false, "onMemoryLevel", "C{@ohos.app.ability.AbilityConstant.AbilityConstant.MemoryLevel}:", memoryLevelItem); TAG_LOGD(AAFwkTag::APPKIT, "end"); } @@ -548,12 +548,12 @@ bool ETSAbilityStage::BindNativeMethods() } std::array functions = { ani_native_function{ - "nativeOnAcceptWantCallback", "Lstd/core/String;:V", + "nativeOnAcceptWantCallback", "C{std.core.String}:", reinterpret_cast(ETSAbilityStage::OnAcceptWantCallback)}, ani_native_function{ - "nativeOnNewProcessRequestCallback", "Lstd/core/String;:V", + "nativeOnNewProcessRequestCallback", "C{std.core.String}:", reinterpret_cast(ETSAbilityStage::OnNewProcessRequestCallback)}, - ani_native_function{"nativeOnPrepareTerminatePromiseCallback", ":V", + ani_native_function{"nativeOnPrepareTerminatePromiseCallback", ":", reinterpret_cast(OnPrepareTerminatePromiseCallback)}, }; ani_class cls {}; @@ -652,7 +652,7 @@ bool ETSAbilityStage::CallOnPrepareTerminateAsync( TAG_LOGE(AAFwkTag::APPKIT, "callbackInfo nullptr"); return false; } - isAsync = CallObjectMethod(true, "callOnPrepareTermination", ":Z"); + isAsync = CallObjectMethod(true, "callOnPrepareTermination", ":z"); return isAsync; } diff --git a/frameworks/native/appkit/ability_runtime/context/ets_ability_lifecycle_callback.cpp b/frameworks/native/appkit/ability_runtime/context/ets_ability_lifecycle_callback.cpp index 05fccbc18cedaec0d8fbf7fb23345e4598441cad..470a8cafc166b5875af45da42c611726b6592804 100644 --- a/frameworks/native/appkit/ability_runtime/context/ets_ability_lifecycle_callback.cpp +++ b/frameworks/native/appkit/ability_runtime/context/ets_ability_lifecycle_callback.cpp @@ -25,11 +25,11 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *SIGNATURE_UIABILITY = "L@ohos/app/ability/UIAbility/UIAbility;:V"; +constexpr const char *SIGNATURE_UIABILITY = "C{@ohos.app.ability.UIAbility.UIAbility}:"; constexpr const char *SIGNATURE_UIABILITY_WINDOW_STAGE = - "L@ohos/app/ability/UIAbility/UIAbility;L@ohos/window/window/WindowStage;:V"; + "C{@ohos.app.ability.UIAbility.UIAbility}C{@ohos.window.window.WindowStage}:"; constexpr const char *SIGNATURE_ABILITY_LIFECYCLE_CALLBACK = - "L@ohos/app/ability/AbilityLifecycleCallback/AbilityLifecycleCallbackInner;"; + "@ohos.app.ability.AbilityLifecycleCallback.AbilityLifecycleCallbackInner"; constexpr const int32_t ERROR_CODE_NULL_ENV = -1; constexpr const int32_t ERROR_CODE_NULL_CALLBACK = -2; constexpr const int32_t ERROR_CODE_NULL_REF = -3; diff --git a/frameworks/native/appkit/ability_runtime/context/ets_interop_ability_lifecycle_callback.cpp b/frameworks/native/appkit/ability_runtime/context/ets_interop_ability_lifecycle_callback.cpp index 2b2d532b8c75a01c8acbb626e88e375e5ebb0fce..21ee9891cebf6c69eb3ab8ad61789f8de0a2dbae 100644 --- a/frameworks/native/appkit/ability_runtime/context/ets_interop_ability_lifecycle_callback.cpp +++ b/frameworks/native/appkit/ability_runtime/context/ets_interop_ability_lifecycle_callback.cpp @@ -25,12 +25,12 @@ namespace OHOS { namespace AbilityRuntime { namespace { constexpr const char *SIGNATURE_NAMESPACE_INTEROP_ABILITY_LIFECYCLE = - "L@ohos/app/ability/InteropAbilityLifecycleCallback/InteropAbilityLifecycle;"; + "@ohos.app.ability.InteropAbilityLifecycleCallback.InteropAbilityLifecycle"; constexpr const char *SIGNATURE_UIABILITY = - "Lstd/interop/ESValue;L@ohos/app/ability/InteropAbilityLifecycleCallback/InteropAbilityLifecycleCallback;:V"; + "C{std.interop.ESValue}C{@ohos.app.ability.InteropAbilityLifecycleCallback.InteropAbilityLifecycleCallback}:"; constexpr const char *SIGNATURE_UIABILITY_WINDOW_STAGE = - "Lstd/interop/ESValue;Lstd/interop/ESValue;" - "L@ohos/app/ability/InteropAbilityLifecycleCallback/InteropAbilityLifecycleCallback;:V"; + "C{std.interop.ESValue}C{std.interop.ESValue}" + "C{@ohos.app.ability.InteropAbilityLifecycleCallback.InteropAbilityLifecycleCallback}:"; constexpr const int32_t ERROR_CODE_NULL_ENV = -1; constexpr const int32_t ERROR_CODE_NULL_CALLBACK = -2; constexpr const int32_t ERROR_CODE_NULL_REF = -3; diff --git a/frameworks/native/insight_intent/insight_intent_context/ets_insight_intent_context.cpp b/frameworks/native/insight_intent/insight_intent_context/ets_insight_intent_context.cpp index 62a7cb80c95db7abfaea4e06242dfa3bc136f139..bdd2fcbbbd7c0224f8cb0b86fe0e2140a278a4c7 100644 --- a/frameworks/native/insight_intent/insight_intent_context/ets_insight_intent_context.cpp +++ b/frameworks/native/insight_intent/insight_intent_context/ets_insight_intent_context.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace AbilityRuntime { namespace { -constexpr const char *CONTEXT_CLASS_NAME = "L@ohos/app/ability/InsightIntentContext/InsightIntentContext;"; +constexpr const char *CONTEXT_CLASS_NAME = "@ohos.app.ability.InsightIntentContext.InsightIntentContext"; } void EtsInsightIntentContext::Finalizer(ani_env *env, void *data, void *hint) { @@ -138,7 +138,7 @@ std::unique_ptr CreateEtsInsightIntentContext(an return std::unique_ptr(); } } - if ((status = env->Class_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { TAG_LOGE(AAFwkTag::INTENT, "status: %{public}d", status); return std::unique_ptr(); } diff --git a/interfaces/kits/native/appkit/ability_runtime/app/ets_ability_stage_context.h b/interfaces/kits/native/appkit/ability_runtime/app/ets_ability_stage_context.h index 4431bdd6acbb8f3f91f62b24378770411e304c16..6f08446f4d07d255cd9749a58cacfdcccaa524a9 100644 --- a/interfaces/kits/native/appkit/ability_runtime/app/ets_ability_stage_context.h +++ b/interfaces/kits/native/appkit/ability_runtime/app/ets_ability_stage_context.h @@ -25,9 +25,9 @@ namespace AppExecFwk { class OHOSApplication; } namespace AbilityRuntime { -constexpr const char* ETS_ABILITY_STAGE_CONTEXT_CLASS_NAME = "Lapplication/AbilityStageContext/AbilityStageContext;"; -constexpr const char* ETS_ABILITY_STAGE_CLASS_NAME = "L@ohos/app/ability/AbilityStage/AbilityStage;"; -constexpr const char* ETS_HAPMODULEINFO_CLASS_NAME = "LbundleManager/HapModuleInfoInner/HapModuleInfoInner;"; +constexpr const char* ETS_ABILITY_STAGE_CONTEXT_CLASS_NAME = "application.AbilityStageContext.AbilityStageContext"; +constexpr const char* ETS_ABILITY_STAGE_CLASS_NAME = "@ohos.app.ability.AbilityStage.AbilityStage"; +constexpr const char* ETS_HAPMODULEINFO_CLASS_NAME = "bundleManager.HapModuleInfoInner.HapModuleInfoInner"; class Context; class ETSAbilityStageContext final {