diff --git a/frameworks/ets/ani/accesstoken/include/ani_request_permission.h b/frameworks/ets/ani/accesstoken/include/ani_request_permission.h index cfcbfcf3a1188ca0da83ff9e5cc3a97a6a3f8a69..1cf256e82d17965c40f9d34a701a1ff3f7d6e789 100644 --- a/frameworks/ets/ani/accesstoken/include/ani_request_permission.h +++ b/frameworks/ets/ani/accesstoken/include/ani_request_permission.h @@ -114,7 +114,7 @@ struct ResultCallback { }; void RequestPermissionsFromUserExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, - ani_object aniContext, ani_array_ref permissionList, ani_object callback); + ani_object aniContext, ani_array permissionList, ani_object callback); class RegisterPermStateChangeScopePtr : public std::enable_shared_from_this, public PermStateChangeCallbackCustomize { diff --git a/frameworks/ets/ani/accesstoken/include/ani_request_permission_on_setting.h b/frameworks/ets/ani/accesstoken/include/ani_request_permission_on_setting.h index 5d73f58179d3378d0b2bff811cef19e706f70030..cd809fb90e30e52a6124113ca7648f0e00a22f62 100644 --- a/frameworks/ets/ani/accesstoken/include/ani_request_permission_on_setting.h +++ b/frameworks/ets/ani/accesstoken/include/ani_request_permission_on_setting.h @@ -89,7 +89,7 @@ private: }; void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, - [[maybe_unused]] ani_object object, ani_object aniContext, ani_array_ref permissionList, ani_object callback); + [[maybe_unused]] ani_object object, ani_object aniContext, ani_array permissionList, ani_object callback); } // namespace AccessToken } // namespace Security } // namespace OHOS diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 1d73ec51d3f4dfbfade2bdd75a7f3709aa3357a3..8398a0bfff8432928394f2a5f9c42e1b80670d60 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -377,7 +377,7 @@ static ani_int GetVersionExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] } static ani_ref GetPermissionsStatusExecute([[maybe_unused]] ani_env* env, - [[maybe_unused]] ani_object object, ani_int aniTokenID, ani_array_ref aniPermissionList) + [[maybe_unused]] ani_object object, ani_int aniTokenID, ani_array aniPermissionList) { ACCESSTOKEN_LOG_INFO(LABEL, "GetPermissionsStatusExecute begin."); if ((env == nullptr) || (aniPermissionList == nullptr)) { @@ -530,7 +530,7 @@ static bool SetupPermissionSubscriber( return true; } -static bool ParseInputToRegister(const ani_string& aniType, const ani_array_ref& aniId, const ani_array_ref& aniArray, +static bool ParseInputToRegister(const ani_string& aniType, const ani_array& aniId, const ani_array& aniArray, const ani_ref& aniCallback, RegisterPermStateChangeInf* context, bool isReg) { std::string type = ParseAniString(context->env, aniType); @@ -632,7 +632,7 @@ static bool IsExistRegister(const RegisterPermStateChangeInf* context) } static void RegisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, - ani_string aniType, ani_array_ref aniId, ani_array_ref aniArray, ani_ref callback) + ani_string aniType, ani_array aniId, ani_array aniArray, ani_ref callback) { if (env == nullptr) { BusinessErrorAni::ThrowError(env, STS_ERROR_INNER, GetErrorMessage(STSErrorCode::STS_ERROR_INNER)); @@ -755,7 +755,7 @@ static void DeleteRegisterFromVector(const RegisterPermStateChangeInf* context) } static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, - ani_string aniType, ani_array_ref aniId, ani_array_ref aniArray, ani_ref callback) + ani_string aniType, ani_array aniId, ani_array aniArray, ani_ref callback) { ACCESSTOKEN_LOG_DEBUG(LABEL, "UnregisterPermStateChangeCallback In."); if (env == nullptr) { @@ -883,4 +883,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp index ca7cac971724be55c897b3652b8659302555e263..b78256b721c4a2bce5e40f5aeff8b68c35a45629 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp @@ -412,7 +412,7 @@ static void RequestPermissionsFromUserProcess(std::shared_ptr& asyncContext) { ani_vm* vm; @@ -444,7 +444,7 @@ static bool ParseRequestPermissionFromUser(ani_env* env, ani_object aniContext, } void RequestPermissionsFromUserExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, - ani_object aniContext, ani_array_ref aniPermissionList, ani_object callback) + ani_object aniContext, ani_array aniPermissionList, ani_object callback) { if (env == nullptr || aniPermissionList == nullptr || callback == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "Parenv or aniPermissionList or callback is null."); @@ -666,4 +666,4 @@ void AuthorizationResult::WindowShownCallback() } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp index 3d8dc482e85454333f582f147871cb5cb5b1b22f..f11ddd18cb71d9445565aa984bc4f92cd2ef9ad3 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp @@ -91,7 +91,7 @@ static ani_status GetContext( return ANI_OK; } -static bool ParseRequestPermissionOnSetting(ani_env* env, ani_object& aniContext, ani_array_ref& aniPermissionList, +static bool ParseRequestPermissionOnSetting(ani_env* env, ani_object& aniContext, ani_array& aniPermissionList, ani_object callback, std::shared_ptr& asyncContext) { ani_vm* vm; @@ -559,7 +559,7 @@ void RequestOnSettingAsyncInstanceControl::CheckDynamicRequest( } void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, - [[maybe_unused]] ani_object object, ani_object aniContext, ani_array_ref permissionList, ani_object callback) + [[maybe_unused]] ani_object object, ani_object aniContext, ani_array permissionList, ani_object callback) { if (env == nullptr || permissionList == nullptr || callback == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "env or permissionList or callback is null."); @@ -599,4 +599,4 @@ void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/ets/ani/common/include/ani_utils.h b/frameworks/ets/ani/common/include/ani_utils.h index 8c7b6222b85bf9d7adcdf83dc2e3cd75be4fdc56..2550d4d546faa44e5c8de79a8b46543d73a48a33 100644 --- a/frameworks/ets/ani/common/include/ani_utils.h +++ b/frameworks/ets/ani/common/include/ani_utils.h @@ -35,7 +35,7 @@ bool AniClassFindField(ani_env* env, const ani_class& aniClass, const std::strin bool AniParseCallback(ani_env* env, const ani_ref& ani_callback, ani_ref& out); bool AniIsRefUndefined(ani_env* env, const ani_ref& ref); bool AniParseUint32(ani_env* env, const ani_int& aniInt, uint32_t& out); -bool AniParseAccessTokenIDArray(ani_env* env, const ani_array_ref& array, std::vector& out); +bool AniParseAccessTokenIDArray(ani_env* env, const ani_array& array, std::vector& out); bool GetBoolProperty(ani_env* env, const ani_object& object, const std::string& property, bool& value); bool GetIntProperty(ani_env* env, const ani_object& object, const std::string& property, int32_t& value); @@ -62,7 +62,7 @@ bool AniFunctionalObjectCall(ani_env *env, const ani_fn_object& fn, ani_size siz // ani to naitive std::string ParseAniString(ani_env* env, ani_string aniStr); -std::vector ParseAniStringVector(ani_env* env, const ani_array_ref& aniStrArr); +std::vector ParseAniStringVector(ani_env* env, const ani_array& aniStrArr); // native to ani ani_string CreateAniString(ani_env *env, const std::string& str); diff --git a/frameworks/ets/ani/common/src/ani_utils.cpp b/frameworks/ets/ani/common/src/ani_utils.cpp index 53842ea3a2ecd619b70382639c6fefcf36eb5407..6077e496cc161f4c72da04850863a0dd3ebe8156 100644 --- a/frameworks/ets/ani/common/src/ani_utils.cpp +++ b/frameworks/ets/ani/common/src/ani_utils.cpp @@ -75,7 +75,7 @@ bool AniParseUint32(ani_env* env, const ani_ref& aniInt, uint32_t& out) return true; } -bool AniParseAccessTokenIDArray(ani_env* env, const ani_array_ref& array, std::vector& out) +bool AniParseAccessTokenIDArray(ani_env* env, const ani_array& array, std::vector& out) { ani_size size; if (env->Array_GetLength(array, &size) != ANI_OK) { @@ -85,8 +85,8 @@ bool AniParseAccessTokenIDArray(ani_env* env, const ani_array_ref& array, std::v for (ani_size i = 0; i < size; ++i) { ani_ref elementRef; - if (env->Array_Get_Ref(array, i, &elementRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_Get_Ref failed at index %{public}zu!", i); + if (env->Array_Get(array, i, &elementRef) != ANI_OK) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Array_Get failed at index %{public}zu!", i); return false; } uint32_t value; @@ -101,7 +101,7 @@ bool AniParseAccessTokenIDArray(ani_env* env, const ani_array_ref& array, std::v return true; } -std::vector ParseAniStringVector(ani_env* env, const ani_array_ref& aniStrArr) +std::vector ParseAniStringVector(ani_env* env, const ani_array& aniStrArr) { std::vector out; ani_size size = 0; @@ -112,8 +112,8 @@ std::vector ParseAniStringVector(ani_env* env, const ani_array_ref& for (ani_size i = 0; i < size; ++i) { ani_ref aniRef; - if (env->Array_Get_Ref(aniStrArr, i, &aniRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_Get_Ref failed!"); + if (env->Array_Get(aniStrArr, i, &aniRef) != ANI_OK) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Array_Get failed!"); return out; } @@ -207,25 +207,20 @@ std::string ParseAniString(ani_env* env, ani_string aniStr) ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArray) { ani_size length = cArray.size(); - ani_array_ref aArrayRef = nullptr; - ani_class aStringcls = nullptr; - if (env->FindClass("Lstd/core/String;", &aStringcls) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass String failed."); - return nullptr; - } + ani_array aArrayRef = nullptr; ani_ref undefinedRef = nullptr; if (ANI_OK != env->GetUndefined(&undefinedRef)) { ACCESSTOKEN_LOG_ERROR(LABEL, "GetUndefined failed."); return nullptr; } - if (env->Array_New_Ref(aStringcls, length, undefinedRef, &aArrayRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_New_Ref failed."); + if (env->Array_New(length, undefinedRef, &aArrayRef) != ANI_OK) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Array_New failed."); return nullptr; } ani_string aString = nullptr; for (ani_size i = 0; i < length; ++i) { env->String_NewUTF8(cArray[i].c_str(), cArray[i].size(), &aString); - env->Array_Set_Ref(aArrayRef, i, aString); + env->Array_Set(aArrayRef, i, aString); } ani_ref aRef = nullptr; if (env->GlobalReference_Create(aArrayRef, &aRef) != ANI_OK) { @@ -491,7 +486,7 @@ bool GetStringVecProperty( if (AniIsRefUndefined(env, ref)) { return true; } - ani_array_ref anirefArray = static_cast(ref); + ani_array anirefArray = static_cast(ref); value = ParseAniStringVector(env, anirefArray); return true; } diff --git a/frameworks/ets/ani/privacy/src/privacy_manager.cpp b/frameworks/ets/ani/privacy/src/privacy_manager.cpp index 9aadcd341fff766e683074aff25c02963a1415ba..85d3e196699efc315cf2ea249a30dd8ef2f82d2c 100644 --- a/frameworks/ets/ani/privacy/src/privacy_manager.cpp +++ b/frameworks/ets/ani/privacy/src/privacy_manager.cpp @@ -236,7 +236,7 @@ void PermActiveStatusPtr::ActiveStatusChangeCallback(ActiveChangeResponse& activ } } -static bool ParseInputToRegister(const ani_string& aniType, const ani_array_ref& aniArray, +static bool ParseInputToRegister(const ani_string& aniType, const ani_array& aniArray, const ani_ref& aniCallback, RegisterPermActiveChangeContext* context, bool isReg) { std::string type = ParseAniString(context->env, static_cast(aniType)); @@ -313,7 +313,7 @@ static bool IsExistRegister(const RegisterPermActiveChangeContext* context) } static void RegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, - ani_string aniType, ani_array_ref aniArray, ani_ref callback) + ani_string aniType, ani_array aniArray, ani_ref callback) { if (env == nullptr) { return; @@ -427,7 +427,7 @@ static void DeleteRegisterInVector(const RegisterPermActiveChangeContext* contex } static void UnRegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, - ani_string aniType, ani_array_ref aniArray, ani_ref callback) + ani_string aniType, ani_array aniArray, ani_ref callback) { if (env == nullptr) { return; @@ -936,4 +936,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS