From ad4bb7e7b34326a4df457e19c0017ddc84f53896 Mon Sep 17 00:00:00 2001 From: ding-qiaoqiao Date: Thu, 7 Aug 2025 13:47:24 +0800 Subject: [PATCH] =?UTF-8?q?log=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ding-qiaoqiao Change-Id: Ia783b86a5f970b0038fb549b56e33ff27b556c76 --- .../src/ani_ability_access_ctrl.cpp | 128 ++++++------- .../ets/ani/accesstoken/src/ani_common.cpp | 11 +- .../ani_request_global_switch_on_setting.cpp | 82 ++++---- .../src/ani_request_permission.cpp | 114 ++++++----- .../src/ani_request_permission_on_setting.cpp | 99 +++++----- frameworks/ets/ani/common/src/ani_error.cpp | 25 ++- frameworks/ets/ani/common/src/ani_utils.cpp | 180 +++++++++--------- .../ets/ani/privacy/src/privacy_manager.cpp | 111 +++++------ 8 files changed, 369 insertions(+), 381 deletions(-) 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 8b29b4c83..a7e6c51e2 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -20,8 +20,8 @@ #include #include "access_token_error.h" +#include "accesstoken_common_log.h" #include "accesstoken_kit.h" -#include "accesstoken_log.h" #include "ani_request_global_switch_on_setting.h" #include "ani_request_permission.h" #include "ani_request_permission_on_setting.h" @@ -35,7 +35,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniAbilityAccessCtrl" }; constexpr int32_t VALUE_MAX_LEN = 32; std::mutex g_lockCache; static PermissionParamCache g_paramCache; @@ -57,13 +56,13 @@ RegisterPermStateChangeScopePtr::RegisterPermStateChangeScopePtr(const PermState RegisterPermStateChangeScopePtr::~RegisterPermStateChangeScopePtr() { if (vm_ == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "vm is nullptr;"); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return; } bool isSameThread = (threadId_ == std::this_thread::get_id()); ani_env* env = isSameThread ? env_ : GetCurrentEnv(vm_); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Current env is nulltpr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Current env is null."); } else if (ref_ != nullptr) { env->GlobalReference_Delete(ref_); } @@ -104,7 +103,7 @@ static bool SetStringProperty(ani_env* env, ani_object& aniObject, const char* p { ani_string aniString = CreateAniString(env, in); if (env->Object_SetPropertyByName_Ref(aniObject, propertyName, aniString) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_SetPropertyByName_Ref failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_SetPropertyByName_Ref!"); return false; } @@ -142,7 +141,7 @@ static void ConvertPermStateChangeInfo(ani_env* env, const PermStateChangeInfo& void RegisterPermStateChangeScopePtr::PermStateChangeCallback(PermStateChangeInfo& PermStateChangeInfo) { if (vm_ == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "vm is nullptr;"); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return; } @@ -150,12 +149,12 @@ void RegisterPermStateChangeScopePtr::PermStateChangeCallback(PermStateChangeInf ani_options aniArgs {1, &interopEnabled}; ani_env* env; if (vm_->AttachCurrentThread(&aniArgs, ANI_VERSION_1, &env) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "AttachCurrentThread failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to AttachCurrentThread!"); return; } ani_fn_object fnObj = reinterpret_cast(ref_); if (fnObj == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Reinterpret_cast failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Reinterpret_cast!"); return; } @@ -169,7 +168,7 @@ void RegisterPermStateChangeScopePtr::PermStateChangeCallback(PermStateChangeInf return; } if (vm_->DetachCurrentThread() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "DetachCurrentThread failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to DetachCurrentThread!"); return; } } @@ -178,25 +177,25 @@ static ani_object CreateAtManager([[maybe_unused]] ani_env* env) { ani_object atManagerObj = {}; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr env"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null"); return atManagerObj; } static const char* className = "@ohos.abilityAccessCtrl.abilityAccessCtrl.AtManagerInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", className); + LOGE(ATM_DOMAIN, ATM_TAG, "Not found %{public}s.", className); return atManagerObj; } ani_method ctor; if (ANI_OK != env->Class_FindMethod(cls, "", nullptr, &ctor)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "get ctor Failed %{public}s", className); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ctor %{public}s.", className); return atManagerObj; } if (ANI_OK != env->Object_New(cls, ctor, &atManagerObj)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Create Object Failed %{public}s", className); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create Object %{public}s.", className); return atManagerObj; } return atManagerObj; @@ -206,14 +205,14 @@ static std::string GetPermParamValue() { long long sysCommitId = GetSystemCommitId(); if (sysCommitId == g_paramCache.sysCommitIdCache) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "SysCommitId = %{public}lld", sysCommitId); + LOGD(ATM_DOMAIN, ATM_TAG, "SysCommitId = %{public}lld.", sysCommitId); return g_paramCache.sysParamCache; } g_paramCache.sysCommitIdCache = sysCommitId; if (g_paramCache.handle == PARAM_DEFAULT_VALUE) { int32_t handle = static_cast(FindParameter(PERMISSION_STATUS_CHANGE_KEY)); if (handle == PARAM_DEFAULT_VALUE) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindParameter failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindParameter."); return "-1"; } g_paramCache.handle = handle; @@ -224,7 +223,7 @@ static std::string GetPermParamValue() char value[VALUE_MAX_LEN] = { 0 }; auto ret = GetParameterValue(g_paramCache.handle, value, VALUE_MAX_LEN - 1); if (ret < 0) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Return default value, ret=%{public}d", ret); + LOGE(ATM_DOMAIN, ATM_TAG, "Return default value, ret=%{public}d.", ret); return "-1"; } std::string resStr(value); @@ -245,7 +244,7 @@ static void UpdatePermissionCache(AtManagerAsyncContext* asyncContext) AccessToken::AccessTokenKit::VerifyAccessToken(asyncContext->tokenId, asyncContext->permissionName); iter->second.status = asyncContext->grantStatus; iter->second.paramValue = currPara; - ACCESSTOKEN_LOG_DEBUG(LABEL, "Param changed currPara %{public}s", currPara.c_str()); + LOGD(ATM_DOMAIN, ATM_TAG, "Param changed currPara %{public}s.", currPara.c_str()); } else { asyncContext->grantStatus = iter->second.status; } @@ -254,8 +253,8 @@ static void UpdatePermissionCache(AtManagerAsyncContext* asyncContext) AccessToken::AccessTokenKit::VerifyAccessToken(asyncContext->tokenId, asyncContext->permissionName); g_cache[asyncContext->permissionName].status = asyncContext->grantStatus; g_cache[asyncContext->permissionName].paramValue = GetPermParamValue(); - ACCESSTOKEN_LOG_DEBUG( - LABEL, "G_cacheParam set %{public}s", g_cache[asyncContext->permissionName].paramValue.c_str()); + LOGD(ATM_DOMAIN, ATM_TAG, "Success to set G_cacheParam(%{public}s).", + g_cache[asyncContext->permissionName].paramValue.c_str()); } } @@ -263,21 +262,21 @@ static ani_int CheckAccessTokenExecute([[maybe_unused]] ani_env* env, [[maybe_un ani_int aniTokenID, ani_string aniPermission) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr env"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return AccessToken::PermissionState::PERMISSION_DENIED; } AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermission)); if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", + LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permissionName.c_str()); return AccessToken::PermissionState::PERMISSION_DENIED; } auto* asyncContext = new (std::nothrow) AtManagerAsyncContext(); if (asyncContext == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "New struct fail."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to alloc memory for asyncContext."); return AccessToken::PermissionState::PERMISSION_DENIED; } std::unique_ptr context {asyncContext}; @@ -289,7 +288,7 @@ static ani_int CheckAccessTokenExecute([[maybe_unused]] ani_env* env, [[maybe_un return static_cast(asyncContext->grantStatus); } UpdatePermissionCache(asyncContext); - ACCESSTOKEN_LOG_INFO(LABEL, "CheckAccessTokenExecute result : %{public}d", asyncContext->grantStatus); + LOGI(ATM_DOMAIN, ATM_TAG, "CheckAccessTokenExecute result : %{public}d.", asyncContext->grantStatus); return static_cast(asyncContext->grantStatus); } @@ -297,6 +296,7 @@ static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env *env, [[m ani_int aniTokenID, ani_string aniPermission, ani_int aniFlags) { if (env == nullptr) { + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return; } AccessTokenID tokenID = static_cast(aniTokenID); @@ -305,7 +305,7 @@ static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env *env, [[m if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) || (!BusinessErrorAni::ValidatePermissionFlagWithThrowError(env, permissionFlags))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", + LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", tokenID, permissionName.c_str(), permissionFlags); return; } @@ -328,9 +328,9 @@ static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env *env, [[m static void RevokeUserGrantedPermissionExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, ani_int aniTokenID, ani_string aniPermission, ani_int aniFlags) { - ACCESSTOKEN_LOG_INFO(LABEL, "RevokeUserGrantedPermission begin."); + LOGI(ATM_DOMAIN, ATM_TAG, "RevokeUserGrantedPermission begin."); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return; } AccessTokenID tokenID = static_cast(aniTokenID); @@ -339,7 +339,7 @@ static void RevokeUserGrantedPermissionExecute([[maybe_unused]] ani_env* env, if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) || (!BusinessErrorAni::ValidatePermissionFlagWithThrowError(env, permissionFlags))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", + LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", tokenID, permissionName.c_str(), permissionFlags); return; } @@ -361,10 +361,10 @@ static void RevokeUserGrantedPermissionExecute([[maybe_unused]] ani_env* env, static ani_int GetVersionExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object) { - ACCESSTOKEN_LOG_INFO(LABEL, "getVersionExecute begin."); + LOGI(ATM_DOMAIN, ATM_TAG, "GetVersionExecute begin."); uint32_t version = -1; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return static_cast(version); } @@ -380,14 +380,14 @@ 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) { - ACCESSTOKEN_LOG_INFO(LABEL, "GetPermissionsStatusExecute begin."); + LOGI(ATM_DOMAIN, ATM_TAG, "GetPermissionsStatusExecute begin."); if ((env == nullptr) || (aniPermissionList == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "aniPermissionList or env null."); + LOGE(ATM_DOMAIN, ATM_TAG, "AniPermissionList or env is null."); return nullptr; } AccessTokenID tokenID = static_cast(aniTokenID); if (!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) is invalid.", tokenID); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) is invalid.", tokenID); return nullptr; } std::vector permissionList = ParseAniStringVector(env, aniPermissionList); @@ -425,21 +425,21 @@ static ani_int GetPermissionFlagsExecute([[maybe_unused]] ani_env* env, { uint32_t flag = PERMISSION_DEFAULT_FLAG; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return flag; } AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermissionName)); if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", + LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permissionName.c_str()); return flag; } int32_t result = AccessTokenKit::GetPermissionFlag(tokenID, permissionName, flag); if (result != RET_SUCCESS) { - ACCESSTOKEN_LOG_ERROR(LABEL, "result = %{public}d errcode = %{public}d", + LOGE(ATM_DOMAIN, ATM_TAG, "Result = %{public}d errcode = %{public}d", result, BusinessErrorAni::GetStsErrorCode(result)); BusinessErrorAni::ThrowError( env, BusinessErrorAni::GetStsErrorCode(result), GetErrorMessage(BusinessErrorAni::GetStsErrorCode(result))); @@ -451,12 +451,12 @@ static void SetPermissionRequestToggleStatusExecute([[maybe_unused]] ani_env* en [[maybe_unused]] ani_object object, ani_string aniPermissionName, ani_int status) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return; } std::string permissionName = ParseAniString(env, static_cast(aniPermissionName)); if (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission(%{public}s) is invalid.", permissionName.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid Permission(%{public}s).", permissionName.c_str()); return; } int32_t result = AccessTokenKit::SetPermissionRequestToggleStatus(permissionName, status, 0); @@ -472,12 +472,12 @@ static ani_int GetPermissionRequestToggleStatusExecute([[maybe_unused]] ani_env* { uint32_t flag = CLOSED; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return flag; } std::string permissionName = ParseAniString(env, static_cast(aniPermissionName)); if (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission(%{public}s) is invalid.", permissionName.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid Permission(%{public}s).", permissionName.c_str()); return flag; } @@ -493,13 +493,13 @@ static void RequestAppPermOnSettingExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, ani_int tokenID) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return; } int32_t result = AccessTokenKit::RequestAppPermOnSetting(static_cast(tokenID)); if (result != RET_SUCCESS) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Result = %{public}d, errcode = %{public}d.", + LOGE(ATM_DOMAIN, ATM_TAG, "Result=%{public}d, errcode=%{public}d.", result, BusinessErrorAni::GetStsErrorCode(result)); BusinessErrorAni::ThrowError(env, BusinessErrorAni::GetStsErrorCode(result), GetErrorMessage(BusinessErrorAni::GetStsErrorCode(result))); @@ -511,7 +511,7 @@ static bool SetupPermissionSubscriber( { ani_vm* vm; if (context->env->GetVM(&vm) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetVM failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetVM!"); return false; } @@ -642,19 +642,19 @@ static void RegisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[may RegisterPermStateChangeInf* registerPermStateChangeInf = new (std::nothrow) RegisterPermStateChangeInf(); if (registerPermStateChangeInf == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to allocate memory for RegisterPermStateChangeInf!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to allocate memory for RegisterPermStateChangeInf!"); return; } registerPermStateChangeInf->env = env; std::unique_ptr callbackPtr {registerPermStateChangeInf}; if (!ParseInputToRegister(aniType, aniId, aniArray, callback, registerPermStateChangeInf, true)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ParseInputToRegister false."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to ParseInputToRegister."); return; } if (IsExistRegister(registerPermStateChangeInf)) { - ACCESSTOKEN_LOG_ERROR(LABEL, - "Subscribe failed. The current subscriber has existed or Reference_StrictEquals failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, + "Faield to Subscribe. The current subscriber has existed or Reference_StrictEquals failed!"); if (registerPermStateChangeInf->permStateChangeType == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) { BusinessErrorAni::ThrowError( env, STSErrorCode::STS_ERROR_NOT_USE_TOGETHER, @@ -673,7 +673,7 @@ static void RegisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[may result = AccessTokenKit::RegisterSelfPermStateChangeCallback(registerPermStateChangeInf->subscriber); } if (result != RET_SUCCESS) { - ACCESSTOKEN_LOG_ERROR(LABEL, "RegisterPermStateChangeCallback failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to RegisterPermStateChangeCallback."); int32_t stsCode = BusinessErrorAni::GetStsErrorCode(result); BusinessErrorAni::ThrowError(env, stsCode, GetErrorMessage(stsCode)); return; @@ -682,8 +682,8 @@ static void RegisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[may { std::lock_guard lock(g_lockForPermStateChangeRegisters); g_permStateChangeRegisters.emplace_back(registerPermStateChangeInf); - ACCESSTOKEN_LOG_INFO( - LABEL, "Add g_PermStateChangeRegisters.size = %{public}zu", g_permStateChangeRegisters.size()); + LOGI(ATM_DOMAIN, ATM_TAG, + "g_PermStateChangeRegisters size = %{public}zu.", g_permStateChangeRegisters.size()); } callbackPtr.release(); return; @@ -692,7 +692,7 @@ static void RegisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[may static bool FindAndGetSubscriberInVector(RegisterPermStateChangeInf* unregisterPermStateChangeInf, std::vector& batchPermStateChangeRegisters) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "FindAndGetSubscriberInVector In."); + LOGD(ATM_DOMAIN, ATM_TAG, "FindAndGetSubscriberInVector In."); std::lock_guard lock(g_lockForPermStateChangeRegisters); std::vector targetTokenIDs = unregisterPermStateChangeInf->scopeInfo.tokenIDs; std::vector targetPermList = unregisterPermStateChangeInf->scopeInfo.permList; @@ -703,10 +703,10 @@ static bool FindAndGetSubscriberInVector(RegisterPermStateChangeInf* unregisterP for (const auto& item : g_permStateChangeRegisters) { if (isUndef) { // batch delete currentThread callback - ACCESSTOKEN_LOG_INFO(LABEL, "Callback is nullptr."); + LOGI(ATM_DOMAIN, ATM_TAG, "Callback is null."); callbackEqual = IsCurrentThread(item->threadId); } else { - ACCESSTOKEN_LOG_INFO(LABEL, "Compare callback."); + LOGI(ATM_DOMAIN, ATM_TAG, "Compare callback."); if (!AniIsCallbackRefEqual(unregisterPermStateChangeInf->env, callbackRef, unregisterPermStateChangeInf->callbackRef, item->threadId, callbackEqual)) { continue; @@ -758,7 +758,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) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "UnregisterPermStateChangeCallback In."); + LOGD(ATM_DOMAIN, ATM_TAG, "UnregisterPermStateChangeCallback In."); if (env == nullptr) { BusinessErrorAni::ThrowError(env, STS_ERROR_INNER, GetErrorMessage(STSErrorCode::STS_ERROR_INNER)); return; @@ -766,7 +766,7 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m RegisterPermStateChangeInf* context = new (std::nothrow) RegisterPermStateChangeInf(); if (context == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to allocate memory for UnRegisterPermStateChangeInf!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to allocate memory for UnRegisterPermStateChangeInf!"); return; } context->env = env; @@ -778,8 +778,8 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m std::vector batchPermStateChangeRegisters; if (!FindAndGetSubscriberInVector(context, batchPermStateChangeRegisters)) { - ACCESSTOKEN_LOG_ERROR(LABEL, - "Unsubscribe failed. The current subscriber does not exist or Reference_StrictEquals failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, + "Failed to Unsubscribe. The current subscriber does not exist or Reference_StrictEquals failed!"); if (context->permStateChangeType == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) { BusinessErrorAni::ThrowError( env, STSErrorCode::STS_ERROR_NOT_USE_TOGETHER, @@ -802,7 +802,7 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m if (result == RET_SUCCESS) { DeleteRegisterFromVector(item); } else { - ACCESSTOKEN_LOG_ERROR(LABEL, "UnregisterPermStateChangeCallback failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to UnregisterPermStateChangeCallback"); int32_t stsCode = BusinessErrorAni::GetStsErrorCode(result); BusinessErrorAni::ThrowError(env, stsCode, GetErrorMessage(stsCode)); return; @@ -814,26 +814,26 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m void InitAbilityCtrlFunction(ani_env *env) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr env"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return; } const char* spaceName = "@ohos.abilityAccessCtrl.abilityAccessCtrl"; ani_namespace spc; if (ANI_OK != env->FindNamespace(spaceName, &spc)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", spaceName); + LOGE(ATM_DOMAIN, ATM_TAG, "Not found %{public}s.", spaceName); return; } std::array methods = { ani_native_function { "createAtManager", nullptr, reinterpret_cast(CreateAtManager) }, }; if (ANI_OK != env->Namespace_BindNativeFunctions(spc, methods.data(), methods.size())) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind native methods to %{public}s", spaceName); + LOGE(ATM_DOMAIN, ATM_TAG, "Cannot bind native methods to %{public}s.", spaceName); return; }; const char* className = "@ohos.abilityAccessCtrl.abilityAccessCtrl.AtManagerInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Not found %{public}s", className); + LOGE(ATM_DOMAIN, ATM_TAG, "Not found %{public}s.", className); return; } std::array claMethods = { @@ -863,7 +863,7 @@ void InitAbilityCtrlFunction(ani_env *env) ani_native_function { "offExcute", nullptr, reinterpret_cast(UnregisterPermStateChangeCallback) }, }; if (ANI_OK != env->Class_BindNativeMethods(cls, claMethods.data(), claMethods.size())) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind native methods to %{public}s", className); + LOGE(ATM_DOMAIN, ATM_TAG, "Cannot bind native methods to %{public}s", className); return; }; } @@ -871,12 +871,12 @@ extern "C" { ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) { if (vm == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr vm"); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return ANI_INVALID_ARGS; } ani_env* env; if (ANI_OK != vm->GetEnv(ANI_VERSION_1, &env)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Unsupported ANI_VERSION_1"); + LOGE(ATM_DOMAIN, ATM_TAG, "Unsupported ANI_VERSION_1."); return ANI_OUT_OF_MEMORY; } InitAbilityCtrlFunction(env); diff --git a/frameworks/ets/ani/accesstoken/src/ani_common.cpp b/frameworks/ets/ani/accesstoken/src/ani_common.cpp index 1b9ff462d..f1125dc4b 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_common.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_common.cpp @@ -13,13 +13,12 @@ * limitations under the License. */ #include "ani_common.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniAccessTokenCommon" }; constexpr const char* WRAPPER_CLASS_NAME = "@ohos.abilityAccessCtrl.AsyncCallbackWrapper"; constexpr const char* INVOKE_METHOD_NAME = "invoke"; } // namespace @@ -27,26 +26,26 @@ constexpr const char* INVOKE_METHOD_NAME = "invoke"; bool ExecuteAsyncCallback(ani_env* env, ani_object callback, ani_object error, ani_object result) { if (env == nullptr || callback == nullptr || error == nullptr || result == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid paramter."); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid paramter."); return false; } ani_status status = ANI_ERROR; ani_class clsCall {}; if ((status = env->FindClass(WRAPPER_CLASS_NAME, &clsCall)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass, error=%{public}d.", static_cast(status)); return false; } ani_method method = {}; if ((status = env->Class_FindMethod( clsCall, INVOKE_METHOD_NAME, "C{@ohos.base.BusinessError}C{std.core.Object}:", &method)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindMethod, error=%{public}d.", static_cast(status)); return false; } status = env->Object_CallMethod_Void(static_cast(callback), method, error, result); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_CallMethod_Void failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_CallMethod_Void, error=%{public}d.", static_cast(status)); return false; } return true; diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp index 02ced1e18..1cdeeb14e 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ #include "ani_request_global_switch_on_setting.h" +#include "accesstoken_common_log.h" #include "accesstoken_kit.h" -#include "accesstoken_log.h" #include "token_setproc.h" #include "want.h" @@ -25,8 +25,6 @@ std::map>> RequestGlobalSwitchAsyncInstanceControl::instanceIdMap_; std::mutex RequestGlobalSwitchAsyncInstanceControl::instanceIdMutex_; namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniRequestGlobalSwitch" }; const std::string GLOBAL_SWITCH_KEY = "ohos.user.setting.global_switch"; const std::string GLOBAL_SWITCH_RESULT_KEY = "ohos.user.setting.global_switch.result"; const std::string RESULT_ERROR_KEY = "ohos.user.setting.error_code"; @@ -41,13 +39,13 @@ constexpr int32_t SWITCH_IS_ALREADY_OPEN = 3; RequestGlobalSwitchAsyncContext::~RequestGlobalSwitchAsyncContext() { if (vm == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "VM is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return; } bool isSameThread = IsCurrentThread(threadId); ani_env* curEnv = isSameThread ? env : GetCurrentEnv(vm); if (curEnv == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } @@ -62,7 +60,7 @@ static ani_status GetContext( { auto context = OHOS::AbilityRuntime::GetStageModeContext(env, aniContext); if (context == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetStageModeContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetStageModeContext."); return ANI_ERROR; } asyncContext->abilityContext = @@ -70,7 +68,7 @@ static ani_status GetContext( if (asyncContext->abilityContext != nullptr) { auto abilityInfo = asyncContext->abilityContext->GetApplicationInfo(); if (abilityInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->uiAbilityFlag = true; @@ -79,12 +77,12 @@ static ani_status GetContext( asyncContext->uiExtensionContext = OHOS::AbilityRuntime::Context::ConvertTo(context); if (asyncContext->uiExtensionContext == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertTo UIExtensionContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to ConvertTo UIExtensionContext."); return ANI_ERROR; } auto uiExtensionInfo = asyncContext->uiExtensionContext->GetApplicationInfo(); if (uiExtensionInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->tokenId = uiExtensionInfo->accessTokenId; @@ -98,7 +96,7 @@ static bool ParseRequestGlobalSwitch(ani_env* env, ani_object& aniContext, ani_i ani_vm* vm; ani_status status = env->GetVM(&vm); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetVM failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetVM, error=%{public}d.", static_cast(status)); return false; } asyncContext->vm = vm; @@ -141,7 +139,7 @@ static int32_t TransferToStsErrorCode(int32_t errCode) stsCode = STS_ERROR_INNER; break; } - ACCESSTOKEN_LOG_INFO(LABEL, "dialog error(%{public}d) stsCode(%{public}d).", errCode, stsCode); + LOGI(ATM_DOMAIN, ATM_TAG, "Dialog error(%{public}d) stsCode(%{public}d).", errCode, stsCode); return stsCode; } @@ -164,7 +162,7 @@ static void GlobalSwitchResultsCallbackUI(bool switchStatus, std::shared_ptrthreadId); ani_env* env = isSameThread ? data->env : GetCurrentEnv(data->vm); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } @@ -174,7 +172,7 @@ static void GlobalSwitchResultsCallbackUI(bool switchStatus, std::shared_ptr(data->callbackRef), error, CreateBooleanObject(env, data->switchStatus)); if (!isSameThread && data->vm->DetachCurrentThread() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "DetachCurrentThread failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to DetachCurrentThread!"); } } @@ -185,12 +183,12 @@ static void CloseModalUIExtensionMainThread(std::shared_ptrabilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = RET_FAILED; return; } uiContent->CloseModalUIExtension(sessionId); - ACCESSTOKEN_LOG_INFO(LABEL, "Close end, sessionId: %{public}d", sessionId); + LOGI(ATM_DOMAIN, ATM_TAG, "Close end, sessionId: %{public}d.", sessionId); }; #ifdef EVENTHANDLER_ENABLE if (asyncContext->handler_ != nullptr) { @@ -208,7 +206,7 @@ void SwitchOnSettingUICallback::ReleaseHandler(int32_t code) { std::lock_guard lock(this->reqContext_->lockReleaseFlag); if (this->reqContext_->releaseFlag) { - ACCESSTOKEN_LOG_WARN(LABEL, "Callback has executed."); + LOGW(ATM_DOMAIN, ATM_TAG, "Callback has executed."); return; } this->reqContext_->releaseFlag = true; @@ -229,7 +227,7 @@ void SwitchOnSettingUICallback::OnResult(int32_t resultCode, const AAFwk::Want& { this->reqContext_->result.errorCode = result.GetIntParam(RESULT_ERROR_KEY, 0); this->reqContext_->switchStatus = result.GetBoolParam(GLOBAL_SWITCH_RESULT_KEY, 0); - ACCESSTOKEN_LOG_INFO(LABEL, "ResultCode is %{public}d, errorCodeis %{public}d, switchStatus=%{public}d.", + LOGI(ATM_DOMAIN, ATM_TAG, "ResultCode is %{public}d, errorCodeis %{public}d, switchStatus=%{public}d.", resultCode, this->reqContext_->result.errorCode, this->reqContext_->switchStatus); ReleaseHandler(0); } @@ -239,7 +237,7 @@ void SwitchOnSettingUICallback::OnResult(int32_t resultCode, const AAFwk::Want& */ void SwitchOnSettingUICallback::OnReceive(const AAFwk::WantParams& receive) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called!"); + LOGI(ATM_DOMAIN, ATM_TAG, "Called!"); } /* @@ -248,7 +246,7 @@ void SwitchOnSettingUICallback::OnReceive(const AAFwk::WantParams& receive) */ void SwitchOnSettingUICallback::OnRelease(int32_t releaseCode) { - ACCESSTOKEN_LOG_INFO(LABEL, "ReleaseCode is %{public}d", releaseCode); + LOGI(ATM_DOMAIN, ATM_TAG, "ReleaseCode is %{public}d.", releaseCode); ReleaseHandler(-1); } @@ -258,7 +256,7 @@ void SwitchOnSettingUICallback::OnRelease(int32_t releaseCode) */ void SwitchOnSettingUICallback::OnError(int32_t code, const std::string& name, const std::string& message) { - ACCESSTOKEN_LOG_INFO(LABEL, "Code is %{public}d, name is %{public}s, message is %{public}s", + LOGI(ATM_DOMAIN, ATM_TAG, "Code is %{public}d, name is %{public}s, message is %{public}s.", code, name.c_str(), message.c_str()); ReleaseHandler(-1); @@ -270,7 +268,7 @@ void SwitchOnSettingUICallback::OnError(int32_t code, const std::string& name, c */ void SwitchOnSettingUICallback::OnRemoteReady(const std::shared_ptr& uiProxy) { - ACCESSTOKEN_LOG_INFO(LABEL, "Connect to UIExtensionAbility successfully."); + LOGI(ATM_DOMAIN, ATM_TAG, "Connect to UIExtensionAbility successfully."); } /* @@ -278,7 +276,7 @@ void SwitchOnSettingUICallback::OnRemoteReady(const std::shared_ptrabilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to get ui content!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = RET_FAILED; return; } @@ -298,10 +296,10 @@ static void CreateUIExtensionMainThread(std::shared_ptrCreateModalUIExtension(want, uiExtensionCallbacks, config); - ACCESSTOKEN_LOG_INFO(LABEL, "Create end, sessionId: %{public}d, tokenId: %{public}d.", + LOGI(ATM_DOMAIN, ATM_TAG, "Create end, sessionId: %{public}d, tokenId: %{public}d.", sessionId, asyncContext->tokenId); if (sessionId == 0) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to create component, sessionId is 0."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create component, sessionId is 0."); asyncContext->result.errorCode = RET_FAILED; return; } @@ -349,7 +347,7 @@ static void CreateUIExtension( static void StartUIExtension(std::shared_ptr& asyncContext) { AccessTokenKit::GetPermissionManagerInfo(asyncContext->info); - ACCESSTOKEN_LOG_INFO(LABEL, "bundleName: %{public}s, permStateAbilityName: %{public}s.", + LOGI(ATM_DOMAIN, ATM_TAG, "BundleName: %{public}s, permStateAbilityName: %{public}s.", asyncContext->info.grantBundleName.c_str(), asyncContext->info.permStateAbilityName.c_str()); OHOS::AAFwk::Want want; want.SetElementName(asyncContext->info.grantBundleName, asyncContext->info.globalSwitchAbilityName); @@ -364,7 +362,7 @@ static void GetInstanceId(std::shared_ptr& asyn Ace::UIContent* uiContent = GetUIContent(asyncContext->abilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); return; } asyncContext->instanceId = uiContent->GetInstanceId(); @@ -378,19 +376,19 @@ static void GetInstanceId(std::shared_ptr& asyn #else task(); #endif - ACCESSTOKEN_LOG_INFO(LABEL, "Instance id: %{public}d", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "Instance id: %{public}d.", asyncContext->instanceId); } void RequestGlobalSwitchAsyncInstanceControl::AddCallbackByInstanceId( std::shared_ptr& asyncContext) { - ACCESSTOKEN_LOG_INFO(LABEL, "InstanceId: %{public}d", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "InstanceId: %{public}d.", asyncContext->instanceId); { std::lock_guard lock(instanceIdMutex_); auto iter = instanceIdMap_.find(asyncContext->instanceId); // id is existed mean a pop window is showing, add context to waiting queue if (iter != instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "InstanceId: %{public}d has existed.", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "InstanceId: %{public}d has existed.", asyncContext->instanceId); instanceIdMap_[asyncContext->instanceId].emplace_back(asyncContext); return; } @@ -404,7 +402,7 @@ void RequestGlobalSwitchAsyncInstanceControl::UpdateQueueData( const std::shared_ptr& reqContext) { if ((reqContext->result.errorCode != RET_SUCCESS) || !(reqContext->switchStatus)) { - ACCESSTOKEN_LOG_INFO(LABEL, "The queue data does not need to be updated."); + LOGI(ATM_DOMAIN, ATM_TAG, "The queue data does not need to be updated."); return; } @@ -413,11 +411,11 @@ void RequestGlobalSwitchAsyncInstanceControl::UpdateQueueData( int32_t id = reqContext->instanceId; auto iter = instanceIdMap_.find(id); if (iter == instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d not existed.", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d not existed.", id); return; } int32_t targetSwitchType = reqContext->switchType; - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); for (auto& asyncContext : iter->second) { if (targetSwitchType == asyncContext->switchType) { asyncContext->result.errorCode = reqContext->result.errorCode; @@ -436,11 +434,11 @@ void RequestGlobalSwitchAsyncInstanceControl::ExecCallback(int32_t id) std::lock_guard lock(instanceIdMutex_); auto iter = instanceIdMap_.find(id); if (iter == instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d not existed.", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d not existed.", id); return; } while (!iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); asyncContext = iter->second[0]; iter->second.erase(iter->second.begin()); CheckDynamicRequest(asyncContext, isDynamic); @@ -449,7 +447,7 @@ void RequestGlobalSwitchAsyncInstanceControl::ExecCallback(int32_t id) } } if (iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map is empty", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map is empty.", id); instanceIdMap_.erase(id); } } @@ -463,7 +461,7 @@ void RequestGlobalSwitchAsyncInstanceControl::CheckDynamicRequest( { isDynamic = asyncContext->isDynamic; if (!isDynamic) { - ACCESSTOKEN_LOG_INFO(LABEL, "It does not need to request permission exsion"); + LOGI(ATM_DOMAIN, ATM_TAG, "It does not need to request permission exsion."); GlobalSwitchResultsCallbackUI(asyncContext->switchStatus, asyncContext); return; } @@ -473,7 +471,7 @@ void RequestGlobalSwitchExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, ani_object aniContext, ani_int type, ani_object callback) { if (env == nullptr || callback == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env or permissionList or callback is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env or permissionList or callback is null."); return; } @@ -486,7 +484,7 @@ void RequestGlobalSwitchExecute([[maybe_unused]] ani_env* env, ani_object result = CreateBooleanObject(env, false); static AccessTokenID selfTokenID = static_cast(GetSelfTokenID()); if (selfTokenID != asyncContext->tokenId) { - ACCESSTOKEN_LOG_ERROR(LABEL, "The context tokenID %{public}d is not same with selfTokenID %{public}d.", + LOGE(ATM_DOMAIN, ATM_TAG, "The context tokenID %{public}d is not same with selfTokenID %{public}d.", asyncContext->tokenId, selfTokenID); ani_object error = BusinessErrorAni::CreateError(env, STS_ERROR_PARAM_INVALID, GetErrorMessage(STS_ERROR_PARAM_INVALID, @@ -496,16 +494,16 @@ void RequestGlobalSwitchExecute([[maybe_unused]] ani_env* env, } GetInstanceId(asyncContext); RequestGlobalSwitchAsyncInstanceControl::AddCallbackByInstanceId(asyncContext); - ACCESSTOKEN_LOG_INFO(LABEL, "Start to pop ui extension dialog"); + LOGI(ATM_DOMAIN, ATM_TAG, "Start to pop ui extension dialog."); if (asyncContext->result.errorCode != RET_SUCCESS) { int32_t stsCode = TransferToStsErrorCode(asyncContext->result.errorCode); ani_object error = BusinessErrorAni::CreateError( env, stsCode, GetErrorMessage(stsCode, asyncContext->result.errorMsg)); ExecuteAsyncCallback(env, callback, error, result); - ACCESSTOKEN_LOG_WARN(LABEL, "Failed to pop uiextension dialog."); + LOGW(ATM_DOMAIN, ATM_TAG, "Failed to pop uiextension dialog."); } } } // 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 7e2ce3055..d9168c8f5 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp @@ -20,8 +20,8 @@ #include #include "ability_manager_client.h" +#include "accesstoken_common_log.h" #include "accesstoken_kit.h" -#include "accesstoken_log.h" #include "hisysevent.h" #include "token_setproc.h" #include "want.h" @@ -33,8 +33,6 @@ std::map>> RequestAsyn std::mutex RequestAsyncInstanceControl::instanceIdMutex_; namespace { #define SETTER_METHOD_NAME(property) "" #property -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniRequestPermissionFromUser" }; std::mutex g_lockFlag; const std::string PERMISSION_KEY = "ohos.user.grant.permission"; const std::string STATE_KEY = "ohos.user.grant.permission.state"; @@ -53,13 +51,13 @@ const std::string REQUEST_TOKEN_KEY = "ohos.ability.params.request.token"; RequestAsyncContext::~RequestAsyncContext() { if (vm == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "VM is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return; } bool isSameThread = IsCurrentThread(threadId); ani_env* curEnv = isSameThread ? env : GetCurrentEnv(vm); if (curEnv == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } @@ -75,12 +73,12 @@ static inline bool CallSetter(ani_env* env, ani_class cls, ani_object object, co ani_status status = ANI_ERROR; ani_field fieldValue; if (env->Class_FindField(cls, setterName, &fieldValue) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindField Fail %{public}d, name: %{public}s.", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindField %{public}d, name: %{public}s.", static_cast(status), setterName); return false; } if ((status = env->Object_SetField_Ref(object, fieldValue, value)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_SetField_Ref Fail %{public}d, name: %{public}s.", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_SetField_Ref %{public}d, name: %{public}s.", static_cast(status), setterName); return false; } @@ -92,21 +90,21 @@ static ani_object WrapResult(ani_env* env, std::shared_ptr& ani_status status = ANI_ERROR; ani_class cls = nullptr; if ((status = env->FindClass("security.PermissionRequestResult.PermissionRequestResult", &cls)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass status %{public}d ", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "FindClass status %{public}d.", static_cast(status)); return nullptr; } if (cls == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "null cls"); + LOGE(ATM_DOMAIN, ATM_TAG, "Cls is null."); return nullptr; } ani_method method = nullptr; if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod status %{public}d ", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Class_FindMethod status %{public}d.", static_cast(status)); return nullptr; } ani_object aObject = nullptr; if ((status = env->Object_New(cls, method, &aObject)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New status %{public}d ", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Object_New status %{public}d.", static_cast(status)); return nullptr; } auto state = asyncContext->needDynamicRequest ? asyncContext->grantResults : asyncContext->permissionsState; @@ -146,7 +144,7 @@ static void UpdateGrantPermissionResultOnly(const std::vector& perm static bool IsDynamicRequest(std::shared_ptr& asyncContext) { if (asyncContext == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "asyncContext nullptr"); + LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return false; } std::vector permList; @@ -158,26 +156,26 @@ static bool IsDynamicRequest(std::shared_ptr& asyncContext) permList.emplace_back(permState); } auto ret = AccessToken::AccessTokenKit::GetSelfPermissionsState(permList, asyncContext->info); - ACCESSTOKEN_LOG_INFO(LABEL, + LOGI(ATM_DOMAIN, ATM_TAG, "TokenID: %{public}d, bundle: %{public}s, uiExAbility: %{public}s, serExAbility: %{public}s.", asyncContext->tokenId, asyncContext->info.grantBundleName.c_str(), asyncContext->info.grantAbilityName.c_str(), asyncContext->info.grantServiceAbilityName.c_str()); if (ret == AccessToken::FORBIDDEN_OPER) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FORBIDDEN_OPER"); + LOGE(ATM_DOMAIN, ATM_TAG, "FORBIDDEN_OPER."); for (auto& perm : permList) { perm.state = AccessToken::INVALID_OPER; perm.errorReason = PRIVACY_STATEMENT_NOT_AGREED; } } for (const auto& permState : permList) { - ACCESSTOKEN_LOG_INFO(LABEL, "Permission: %{public}s: state: %{public}d, errorReason: %{public}d", + LOGI(ATM_DOMAIN, ATM_TAG, "Permission: %{public}s: state: %{public}d, errorReason: %{public}d.", permState.permissionName.c_str(), permState.state, permState.errorReason); asyncContext->permissionsState.emplace_back(permState.state); asyncContext->dialogShownResults.emplace_back(permState.state == AccessToken::TypePermissionOper::DYNAMIC_OPER); asyncContext->errorReasons.emplace_back(permState.errorReason); } if (permList.size() != asyncContext->permissionList.size()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "permList.size: %{public}zu, permissionList.size: %{public}zu", permList.size(), + LOGE(ATM_DOMAIN, ATM_TAG, "PermList.size: %{public}zu, permissionList.size: %{public}zu.", permList.size(), asyncContext->permissionList.size()); return false; } @@ -192,7 +190,7 @@ static void CreateUIExtensionMainThread(std::shared_ptr& as OHOS::Ace::UIContent* uiContent = GetUIContent(asyncContext->abilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = AccessToken::RET_FAILED; asyncContext->uiExtensionFlag = false; asyncContext->loadlock.unlock(); @@ -203,7 +201,7 @@ static void CreateUIExtensionMainThread(std::shared_ptr& as config.isProhibitBack = true; int32_t sessionId = uiContent->CreateModalUIExtension(want, uiExtensionCallbacks, config); if (sessionId == 0) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Create component failed, sessionId is 0"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Create component, sessionId is 0."); asyncContext->result.errorCode = AccessToken::RET_FAILED; asyncContext->uiExtensionFlag = false; asyncContext->loadlock.unlock(); @@ -225,14 +223,14 @@ static void CreateUIExtensionMainThread(std::shared_ptr& as static void CreateServiceExtension(std::shared_ptr& asyncContext) { if (!asyncContext->uiAbilityFlag) { - ACCESSTOKEN_LOG_ERROR(LABEL, "UIExtension ability can not pop service ablility window!"); + LOGE(ATM_DOMAIN, ATM_TAG, "UIExtension ability can not pop service ablility window!"); asyncContext->needDynamicRequest = false; asyncContext->result.errorCode = RET_FAILED; return; } OHOS::sptr remoteObject = new (std::nothrow) AuthorizationResult(asyncContext); if (remoteObject == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Create window failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Create window!"); asyncContext->needDynamicRequest = false; asyncContext->result.errorCode = RET_FAILED; return; @@ -256,7 +254,7 @@ static void CreateServiceExtension(std::shared_ptr& asyncCo want.SetParam(REQUEST_TOKEN_KEY, asyncContext->abilityContext->GetToken()); int32_t ret = OHOS::AAFwk::AbilityManagerClient::GetInstance()->RequestDialogService( want, asyncContext->abilityContext->GetToken()); - ACCESSTOKEN_LOG_INFO(LABEL, "Request end, ret: %{public}d, tokenId: %{public}d, permNum: %{public}zu", ret, + LOGI(ATM_DOMAIN, ATM_TAG, "Request end, ret: %{public}d, tokenId: %{public}d, permNum: %{public}zu.", ret, asyncContext->tokenId, asyncContext->permissionList.size()); } @@ -291,7 +289,7 @@ static void GetInstanceId(std::shared_ptr& asyncContext) OHOS::Ace::UIContent* uiContent = GetUIContent(asyncContext->abilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content failed!"); return; } asyncContext->uiContentFlag = true; @@ -314,7 +312,7 @@ static void RequestResultsHandler(const std::vector& permissionList std::vector newGrantResults; UpdateGrantPermissionResultOnly(permissionList, permissionStates, data, newGrantResults); if (newGrantResults.empty()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GrantResults empty"); + LOGE(ATM_DOMAIN, ATM_TAG, "Empty grantResults."); data->result.errorCode = RET_FAILED; } data->grantResults.assign(newGrantResults.begin(), newGrantResults.end()); @@ -322,7 +320,7 @@ static void RequestResultsHandler(const std::vector& permissionList bool isSameThread = IsCurrentThread(data->threadId); ani_env* env = isSameThread ? data->env : GetCurrentEnv(data->vm); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } int32_t stsCode = BusinessErrorAni::GetStsErrorCode(data->result.errorCode); @@ -330,7 +328,7 @@ static void RequestResultsHandler(const std::vector& permissionList ani_object result = WrapResult(env, data); ExecuteAsyncCallback(env, reinterpret_cast(data->callbackRef), error, result); if (!isSameThread && data->vm->DetachCurrentThread() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "DetachCurrentThread failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to DetachCurrentThread!"); } } @@ -339,7 +337,7 @@ static ani_status ConvertContext( { auto context = OHOS::AbilityRuntime::GetStageModeContext(env, aniContext); if (context == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetStageModeContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetStageModeContext."); return ANI_ERROR; } asyncContext->abilityContext = @@ -347,7 +345,7 @@ static ani_status ConvertContext( if (asyncContext->abilityContext != nullptr) { auto abilityInfo = asyncContext->abilityContext->GetApplicationInfo(); if (abilityInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->uiAbilityFlag = true; @@ -357,12 +355,12 @@ static ani_status ConvertContext( asyncContext->uiExtensionContext = OHOS::AbilityRuntime::Context::ConvertTo(context); if (asyncContext->uiExtensionContext == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertTo UIExtensionContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to ConvertTo UIExtensionContext."); return ANI_ERROR; } auto uiExtensionInfo = asyncContext->uiExtensionContext->GetApplicationInfo(); if (uiExtensionInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->tokenId = uiExtensionInfo->accessTokenId; @@ -374,10 +372,10 @@ static ani_status ConvertContext( static void RequestPermissionsFromUserProcess(std::shared_ptr& asyncContext) { if (!IsDynamicRequest(asyncContext)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "It does not need to request permission"); + LOGE(ATM_DOMAIN, ATM_TAG, "It does not need to request permission."); asyncContext->needDynamicRequest = false; if ((asyncContext->permissionsState.empty()) && (asyncContext->result.errorCode == RET_SUCCESS)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GrantResults empty"); + LOGE(ATM_DOMAIN, ATM_TAG, "Empty GrantResults."); asyncContext->result.errorCode = RET_FAILED; } return; @@ -385,28 +383,28 @@ static void RequestPermissionsFromUserProcess(std::shared_ptrinfo.grantBundleName == ORI_PERMISSION_MANAGER_BUNDLE_NAME) { - ACCESSTOKEN_LOG_INFO( - LABEL, "Pop service extension dialog, uiContentFlag=%{public}d", asyncContext->uiContentFlag); + LOGI(ATM_DOMAIN, ATM_TAG, + "Pop service extension dialog, uiContentFlag=%{public}d.", asyncContext->uiContentFlag); if (asyncContext->uiContentFlag) { RequestAsyncInstanceControl::AddCallbackByInstanceId(asyncContext); } else { CreateServiceExtension(asyncContext); } } else if (asyncContext->instanceId == -1) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Pop service extension dialog, instanceId is -1."); + LOGE(ATM_DOMAIN, ATM_TAG, "Pop service extension dialog, instanceId is -1."); CreateServiceExtension(asyncContext); HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::ACCESS_TOKEN, "REQUEST_PERMISSIONS_FROM_USER", HiviewDFX::HiSysEvent::EventType::BEHAVIOR, "BUNDLENAME", asyncContext->bundleName.c_str(), "UIEXTENSION_FLAG", false); } else { - ACCESSTOKEN_LOG_INFO(LABEL, "Pop ui extension dialog"); + LOGI(ATM_DOMAIN, ATM_TAG, "Pop ui extension dialog."); asyncContext->uiExtensionFlag = true; RequestAsyncInstanceControl::AddCallbackByInstanceId(asyncContext); HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::ACCESS_TOKEN, "REQUEST_PERMISSIONS_FROM_USER", HiviewDFX::HiSysEvent::EventType::BEHAVIOR, "BUNDLENAME", asyncContext->bundleName, "UIEXTENSION_FLAG", false); if (!asyncContext->uiExtensionFlag) { - ACCESSTOKEN_LOG_WARN(LABEL, "Pop uiextension dialog fail, start to pop service extension dialog."); + LOGW(ATM_DOMAIN, ATM_TAG, "Pop uiextension dialog fail, start to pop service extension dialog."); RequestAsyncInstanceControl::AddCallbackByInstanceId(asyncContext); } } @@ -418,7 +416,7 @@ static bool ParseRequestPermissionFromUser(ani_env* env, ani_object aniContext, ani_vm* vm; ani_status status = env->GetVM(&vm); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetVM failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetVM, error=%{public}d.", static_cast(status)); return false; } asyncContext->vm = vm; @@ -428,7 +426,7 @@ static bool ParseRequestPermissionFromUser(ani_env* env, ani_object aniContext, status = ConvertContext(env, aniContext, asyncContext); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertContext failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to ConvertContext, error=%{public}d.", static_cast(status)); BusinessErrorAni::ThrowParameterTypeError(env, STS_ERROR_PARAM_ILLEGAL, GetParamErrorMsg("context", "UIAbility or UIExtension Context")); return false; @@ -447,7 +445,7 @@ void RequestPermissionsFromUserExecute([[maybe_unused]] ani_env* env, [[maybe_un ani_object aniContext, ani_array_ref aniPermissionList, ani_object callback) { if (env == nullptr || aniPermissionList == nullptr || callback == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Parenv or aniPermissionList or callback is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env or aniPermissionList or callback is null."); return; } std::shared_ptr asyncContext = std::make_shared(); @@ -457,8 +455,8 @@ void RequestPermissionsFromUserExecute([[maybe_unused]] ani_env* env, [[maybe_un static AccessTokenID selfTokenID = static_cast(GetSelfTokenID()); if (selfTokenID != asyncContext->tokenId) { - ACCESSTOKEN_LOG_ERROR( - LABEL, "The context tokenID: %{public}d, selfTokenID: %{public}d.", asyncContext->tokenId, selfTokenID); + LOGE(ATM_DOMAIN, ATM_TAG, + "The context tokenID: %{public}d, selfTokenID: %{public}d.", asyncContext->tokenId, selfTokenID); ani_ref nullRef = nullptr; env->GetNull(&nullRef); @@ -478,7 +476,7 @@ void RequestPermissionsFromUserExecute([[maybe_unused]] ani_env* env, [[maybe_un env, stsCode, GetErrorMessage(stsCode, asyncContext->result.errorMsg)); ani_object result = WrapResult(env, asyncContext); ExecuteAsyncCallback(env, callback, error, result); - ACCESSTOKEN_LOG_INFO(LABEL, "uiExtensionFlag: %{public}d, uiContentFlag: %{public}d, uiAbilityFlag: %{public}d ", + LOGI(ATM_DOMAIN, ATM_TAG, "UiExtensionFlag: %{public}d, uiContentFlag: %{public}d, uiAbilityFlag: %{public}d.", asyncContext->uiExtensionFlag, asyncContext->uiContentFlag, asyncContext->uiAbilityFlag); } @@ -488,12 +486,12 @@ static void CloseModalUIExtensionMainThread(std::shared_ptr Ace::UIContent* uiContent = GetUIContent(asyncContext->abilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = RET_FAILED; return; } uiContent->CloseModalUIExtension(sessionId); - ACCESSTOKEN_LOG_INFO(LABEL, "Close end, sessionId: %{public}d", sessionId); + LOGI(ATM_DOMAIN, ATM_TAG, "Close end, sessionId: %{public}d.", sessionId); }; #ifdef EVENTHANDLER_ENABLE if (asyncContext->handler_ != nullptr) { @@ -504,7 +502,7 @@ static void CloseModalUIExtensionMainThread(std::shared_ptr #else task(); #endif - ACCESSTOKEN_LOG_INFO(LABEL, "Instance id: %{public}d", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "Instance id: %{public}d.", asyncContext->instanceId); } void RequestAsyncInstanceControl::ExecCallback(int32_t id) @@ -515,11 +513,11 @@ void RequestAsyncInstanceControl::ExecCallback(int32_t id) std::lock_guard lock(instanceIdMutex_); auto iter = RequestAsyncInstanceControl::instanceIdMap_.find(id); if (iter == RequestAsyncInstanceControl::instanceIdMap_.end()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Id: %{public}d not existed.", id); + LOGE(ATM_DOMAIN, ATM_TAG, "Id: %{public}d not existed.", id); return; } while (!iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); asyncContext = iter->second[0]; iter->second.erase(iter->second.begin()); CheckDynamicRequest(asyncContext, isDynamic); @@ -528,7 +526,7 @@ void RequestAsyncInstanceControl::ExecCallback(int32_t id) } } if (iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map is empty", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map is empty.", id); RequestAsyncInstanceControl::instanceIdMap_.erase(id); } } @@ -589,14 +587,14 @@ void UIExtensionCallback::ReleaseHandler(int32_t code) { std::lock_guard lock(g_lockFlag); if (this->reqContext_->releaseFlag) { - ACCESSTOKEN_LOG_WARN(LABEL, "Callback has executed."); + LOGW(ATM_DOMAIN, ATM_TAG, "Callback has executed."); return; } this->reqContext_->releaseFlag = true; } CloseModalUIExtensionMainThread(this->reqContext_, this->sessionId_); this->reqContext_->result.errorCode = code; - ACCESSTOKEN_LOG_ERROR(LABEL, "ReleaseHandler errorCode: %{public}d", + LOGE(ATM_DOMAIN, ATM_TAG, "ReleaseHandler errorCode: %{public}d.", this->reqContext_->result.errorCode); RequestAsyncInstanceControl::ExecCallback(this->reqContext_->instanceId); RequestResultsHandler(this->reqContext_->permissionList, this->reqContext_->permissionsState, this->reqContext_); @@ -604,7 +602,7 @@ void UIExtensionCallback::ReleaseHandler(int32_t code) void UIExtensionCallback::OnResult(int32_t resultCode, const OHOS::AAFwk::Want& result) { - ACCESSTOKEN_LOG_INFO(LABEL, "ResultCode is %{public}d", resultCode); + LOGI(ATM_DOMAIN, ATM_TAG, "ResultCode is %{public}d.", resultCode); this->reqContext_->permissionList = result.GetStringArrayParam(PERMISSION_KEY); this->reqContext_->permissionsState = result.GetIntArrayParam(RESULT_KEY); ReleaseHandler(0); @@ -612,31 +610,31 @@ void UIExtensionCallback::OnResult(int32_t resultCode, const OHOS::AAFwk::Want& void UIExtensionCallback::OnReceive(const OHOS::AAFwk::WantParams& receive) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called!"); + LOGI(ATM_DOMAIN, ATM_TAG, "Called!"); } void UIExtensionCallback::OnRelease(int32_t releaseCode) { - ACCESSTOKEN_LOG_INFO(LABEL, "ReleaseCode is %{public}d", releaseCode); + LOGI(ATM_DOMAIN, ATM_TAG, "ReleaseCode is %{public}d.", releaseCode); ReleaseHandler(-1); } void UIExtensionCallback::OnError(int32_t code, const std::string& name, const std::string& message) { - ACCESSTOKEN_LOG_INFO( - LABEL, "Code is %{public}d, name is %{public}s, message is %{public}s", code, name.c_str(), message.c_str()); + LOGI(ATM_DOMAIN, ATM_TAG, + "Code is %{public}d, name is %{public}s, message is %{public}s.", code, name.c_str(), message.c_str()); ReleaseHandler(-1); } void UIExtensionCallback::OnRemoteReady(const std::shared_ptr& uiProxy) { - ACCESSTOKEN_LOG_INFO(LABEL, "Connect to UIExtensionAbility successfully."); + LOGI(ATM_DOMAIN, ATM_TAG, "Connect to UIExtensionAbility successfully."); } void UIExtensionCallback::OnDestroy() { - ACCESSTOKEN_LOG_INFO(LABEL, "UIExtensionAbility destructed."); + LOGI(ATM_DOMAIN, ATM_TAG, "UIExtensionAbility destructed."); ReleaseHandler(-1); } @@ -647,7 +645,7 @@ void AuthorizationResult::GrantResultsCallback( if (asyncContext == nullptr) { return; } - ACCESSTOKEN_LOG_ERROR(LABEL, "GrantResultsCallback"); + LOGE(ATM_DOMAIN, ATM_TAG, "GrantResultsCallback."); RequestResultsHandler(permissionList, grantResults, asyncContext); } 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 ac18a47d0..e65856d87 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 @@ -13,8 +13,8 @@ * limitations under the License. */ #include "ani_request_permission_on_setting.h" +#include "accesstoken_common_log.h" #include "accesstoken_kit.h" -#include "accesstoken_log.h" #include "token_setproc.h" #include "want.h" @@ -25,7 +25,6 @@ std::map> RequestOnSettingAsyncInstanceControl::instanceIdMap_; std::mutex RequestOnSettingAsyncInstanceControl::instanceIdMutex_; namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AniRequestPermission" }; constexpr int32_t REQUEST_REALDY_EXIST = 1; constexpr int32_t PERM_NOT_BELONG_TO_SAME_GROUP = 2; constexpr int32_t PERM_IS_NOT_DECLARE = 3; @@ -40,13 +39,13 @@ const std::string PERMISSION_RESULT_KEY = "ohos.user.setting.permission.result"; RequestPermOnSettingAsyncContext::~RequestPermOnSettingAsyncContext() { if (vm == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "VM is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return; } bool isSameThread = IsCurrentThread(threadId); ani_env* curEnv = isSameThread ? env : GetCurrentEnv(vm); if (curEnv == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } @@ -61,7 +60,7 @@ static ani_status GetContext( { auto context = OHOS::AbilityRuntime::GetStageModeContext(env, aniContext); if (context == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetStageModeContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetStageModeContext."); return ANI_ERROR; } asyncContext->abilityContext = @@ -69,7 +68,7 @@ static ani_status GetContext( if (asyncContext->abilityContext != nullptr) { auto abilityInfo = asyncContext->abilityContext->GetApplicationInfo(); if (abilityInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->uiAbilityFlag = true; @@ -78,12 +77,12 @@ static ani_status GetContext( asyncContext->uiExtensionContext = OHOS::AbilityRuntime::Context::ConvertTo(context); if (asyncContext->uiExtensionContext == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertTo UIExtensionContext failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to ConvertTo UIExtensionContext."); return ANI_ERROR; } auto uiExtensionInfo = asyncContext->uiExtensionContext->GetApplicationInfo(); if (uiExtensionInfo == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetApplicationInfo failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetApplicationInfo."); return ANI_ERROR; } asyncContext->tokenId = uiExtensionInfo->accessTokenId; @@ -97,7 +96,7 @@ static bool ParseRequestPermissionOnSetting(ani_env* env, ani_object& aniContext ani_vm* vm; ani_status status = env->GetVM(&vm); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetVM failed, error=%{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetVM, error=%{public}d.", static_cast(status)); return false; } asyncContext->vm = vm; @@ -133,26 +132,26 @@ static ani_object ReturnResult(ani_env* env, std::shared_ptrFindClass("escompat.Array", &arrayCls) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass name escompat.Array failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass name escompat.Array!"); return nullptr; } ani_method arrayCtor; if (env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass !"); return nullptr; } ani_object arrayObj; if (env->Object_New(arrayCls, arrayCtor, &arrayObj, asyncContext->stateList.size()) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object new failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Object new failed!"); return nullptr; } const char* enumDescriptor = "@ohos.abilityAccessCtrl.abilityAccessCtrl.GrantStatus"; ani_enum enumType; if (env->FindEnum(enumDescriptor, &enumType) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass name %{public}s failed!", enumDescriptor); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass name %{public}s!", enumDescriptor); return nullptr; } @@ -162,12 +161,12 @@ static ani_object ReturnResult(ani_env* env, std::shared_ptrEnum_GetEnumItemByIndex(enumType, enumIndex, &enumItem) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetEnumItemByIndex value %{public}u failed!", state); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetEnumItemByIndex value %{public}u!", state); break; } if (env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, enumItem) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_CallMethodByName_Void $_set failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_CallMethodByName_Void $_set!"); break; } index++; @@ -202,7 +201,7 @@ static int32_t TransferToStsErrorCode(int32_t errorCode) stsCode = STS_ERROR_INNER; break; } - ACCESSTOKEN_LOG_INFO(LABEL, "Dialog error(%{public}d) stsCode(%{public}d).", errorCode, stsCode); + LOGI(ATM_DOMAIN, ATM_TAG, "Dialog error(%{public}d) stsCode(%{public}d).", errorCode, stsCode); return stsCode; } @@ -226,7 +225,7 @@ static void PermissionResultsCallbackUI( bool isSameThread = IsCurrentThread(data->threadId); ani_env* env = isSameThread ? data->env : GetCurrentEnv(data->vm); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetCurrentEnv failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetCurrentEnv."); return; } @@ -236,7 +235,7 @@ static void PermissionResultsCallbackUI( ExecuteAsyncCallback(env, reinterpret_cast(data->callbackRef), error, result); if (!isSameThread && data->vm->DetachCurrentThread() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "DetachCurrentThread failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to DetachCurrentThread!"); } } @@ -247,12 +246,12 @@ static void CloseSettingModalUIExtensionMainThread(std::shared_ptrabilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = RET_FAILED; return; } uiContent->CloseModalUIExtension(sessionId); - ACCESSTOKEN_LOG_INFO(LABEL, "Close end, sessionId: %{public}d", sessionId); + LOGI(ATM_DOMAIN, ATM_TAG, "Close end, sessionId: %{public}d.", sessionId); }; #ifdef EVENTHANDLER_ENABLE if (asyncContext->handler_ != nullptr) { @@ -270,7 +269,7 @@ void PermissonOnSettingUICallback::ReleaseHandler(int32_t code) { std::lock_guard lock(this->reqContext_->lockReleaseFlag); if (this->reqContext_->releaseFlag) { - ACCESSTOKEN_LOG_WARN(LABEL, "Callback has executed."); + LOGW(ATM_DOMAIN, ATM_TAG, "Callback has executed."); return; } this->reqContext_->releaseFlag = true; @@ -291,7 +290,7 @@ void PermissonOnSettingUICallback::OnResult(int32_t resultCode, const AAFwk::Wan { this->reqContext_->result.errorCode = result.GetIntParam(RESULT_ERROR_KEY, 0); this->reqContext_->stateList = result.GetIntArrayParam(PERMISSION_RESULT_KEY); - ACCESSTOKEN_LOG_INFO(LABEL, "ResultCode is %{public}d, errorCodeis %{public}d, listSize=%{public}zu.", + LOGI(ATM_DOMAIN, ATM_TAG, "ResultCode is %{public}d, errorCodeis %{public}d, listSize=%{public}zu.", resultCode, this->reqContext_->result.errorCode, this->reqContext_->stateList.size()); ReleaseHandler(0); } @@ -301,7 +300,7 @@ void PermissonOnSettingUICallback::OnResult(int32_t resultCode, const AAFwk::Wan */ void PermissonOnSettingUICallback::OnReceive(const AAFwk::WantParams& receive) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called!"); + LOGI(ATM_DOMAIN, ATM_TAG, "Called!"); } /* @@ -310,7 +309,7 @@ void PermissonOnSettingUICallback::OnReceive(const AAFwk::WantParams& receive) */ void PermissonOnSettingUICallback::OnRelease(int32_t releaseCode) { - ACCESSTOKEN_LOG_INFO(LABEL, "ReleaseCode is %{public}d", releaseCode); + LOGI(ATM_DOMAIN, ATM_TAG, "ReleaseCode is %{public}d.", releaseCode); ReleaseHandler(-1); } @@ -320,7 +319,7 @@ void PermissonOnSettingUICallback::OnRelease(int32_t releaseCode) */ void PermissonOnSettingUICallback::OnError(int32_t code, const std::string& name, const std::string& message) { - ACCESSTOKEN_LOG_INFO(LABEL, "Code is %{public}d, name is %{public}s, message is %{public}s", + LOGI(ATM_DOMAIN, ATM_TAG, "Code is %{public}d, name is %{public}s, message is %{public}s.", code, name.c_str(), message.c_str()); ReleaseHandler(-1); @@ -332,7 +331,7 @@ void PermissonOnSettingUICallback::OnError(int32_t code, const std::string& name */ void PermissonOnSettingUICallback::OnRemoteReady(const std::shared_ptr& uiProxy) { - ACCESSTOKEN_LOG_INFO(LABEL, "Connect to UIExtensionAbility successfully."); + LOGI(ATM_DOMAIN, ATM_TAG, "Connect to UIExtensionAbility successfully."); } /* @@ -340,7 +339,7 @@ void PermissonOnSettingUICallback::OnRemoteReady(const std::shared_ptrabilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to get ui content!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); asyncContext->result.errorCode = RET_FAILED; return; } @@ -360,10 +359,10 @@ static void CreateSettingUIExtensionMainThread(std::shared_ptrCreateModalUIExtension(want, uiExtensionCallbacks, config); - ACCESSTOKEN_LOG_INFO(LABEL, "Create end, sessionId: %{public}d, tokenId: %{public}d.", + LOGI(ATM_DOMAIN, ATM_TAG, "Create end, sessionId: %{public}d, tokenId: %{public}d.", sessionId, asyncContext->tokenId); if (sessionId == 0) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to create component, sessionId is 0."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create component, sessionId is 0."); asyncContext->result.errorCode = RET_FAILED; return; } @@ -411,7 +410,7 @@ static void CreateUIExtension( static void StartUIExtension(std::shared_ptr& asyncContext) { AccessTokenKit::GetPermissionManagerInfo(asyncContext->info); - ACCESSTOKEN_LOG_INFO(LABEL, "bundleName: %{public}s, permStateAbilityName: %{public}s.", + LOGI(ATM_DOMAIN, ATM_TAG, "BundleName: %{public}s, permStateAbilityName: %{public}s.", asyncContext->info.grantBundleName.c_str(), asyncContext->info.permStateAbilityName.c_str()); OHOS::AAFwk::Want want; want.SetElementName(asyncContext->info.grantBundleName, asyncContext->info.permStateAbilityName); @@ -426,7 +425,7 @@ static void GetInstanceId(std::shared_ptr& asy Ace::UIContent* uiContent = GetUIContent(asyncContext->abilityContext, asyncContext->uiExtensionContext, asyncContext->uiAbilityFlag); if (uiContent == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get ui content failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get ui content!"); return; } asyncContext->instanceId = uiContent->GetInstanceId(); @@ -440,19 +439,19 @@ static void GetInstanceId(std::shared_ptr& asy #else task(); #endif - ACCESSTOKEN_LOG_INFO(LABEL, "Instance id: %{public}d", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "Instance id: %{public}d.", asyncContext->instanceId); } void RequestOnSettingAsyncInstanceControl::AddCallbackByInstanceId( std::shared_ptr& asyncContext) { - ACCESSTOKEN_LOG_INFO(LABEL, "InstanceId: %{public}d", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "InstanceId: %{public}d.", asyncContext->instanceId); { std::lock_guard lock(instanceIdMutex_); auto iter = instanceIdMap_.find(asyncContext->instanceId); // id is existed mean a pop window is showing, add context to waiting queue if (iter != instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "InstanceId: %{public}d has existed.", asyncContext->instanceId); + LOGI(ATM_DOMAIN, ATM_TAG, "InstanceId: %{public}d has existed.", asyncContext->instanceId); instanceIdMap_[asyncContext->instanceId].emplace_back(asyncContext); return; } @@ -465,8 +464,8 @@ void RequestOnSettingAsyncInstanceControl::AddCallbackByInstanceId( bool static CheckPermList(std::vector permList, std::vector tmpPermList) { if (permList.size() != tmpPermList.size()) { - ACCESSTOKEN_LOG_ERROR( - LABEL, "Perm list size not equal, CurrentPermList size: %{public}zu.", tmpPermList.size()); + LOGE(ATM_DOMAIN, ATM_TAG, + "Perm list size not equal, CurrentPermList size: %{public}zu.", tmpPermList.size()); return false; } @@ -475,7 +474,7 @@ bool static CheckPermList(std::vector permList, std::vector& reqContext) { if (reqContext->result.errorCode != RET_SUCCESS) { - ACCESSTOKEN_LOG_INFO(LABEL, "The queue data does not need to be updated."); + LOGI(ATM_DOMAIN, ATM_TAG, "The queue data does not need to be updated."); return; } for (const int32_t item : reqContext->stateList) { if (item != PERMISSION_GRANTED) { - ACCESSTOKEN_LOG_INFO(LABEL, "The queue data does not need to be updated"); + LOGI(ATM_DOMAIN, ATM_TAG, "The queue data does not need to be updated."); return; } } @@ -501,11 +500,11 @@ void RequestOnSettingAsyncInstanceControl::UpdateQueueData( int32_t id = reqContext->instanceId; auto iter = instanceIdMap_.find(id); if (iter == instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d not existed.", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d not existed.", id); return; } std::vector permList = reqContext->permissionList; - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); for (auto& asyncContext : iter->second) { std::vector tmpPermList = asyncContext->permissionList; if (CheckPermList(permList, tmpPermList)) { @@ -525,11 +524,11 @@ void RequestOnSettingAsyncInstanceControl::ExecCallback(int32_t id) std::lock_guard lock(instanceIdMutex_); auto iter = instanceIdMap_.find(id); if (iter == instanceIdMap_.end()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d not existed.", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d not existed.", id); return; } while (!iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map size: %{public}zu.", id, iter->second.size()); asyncContext = iter->second[0]; iter->second.erase(iter->second.begin()); CheckDynamicRequest(asyncContext, isDynamic); @@ -538,7 +537,7 @@ void RequestOnSettingAsyncInstanceControl::ExecCallback(int32_t id) } } if (iter->second.empty()) { - ACCESSTOKEN_LOG_INFO(LABEL, "Id: %{public}d, map is empty", id); + LOGI(ATM_DOMAIN, ATM_TAG, "Id: %{public}d, map is empty.", id); instanceIdMap_.erase(id); } } @@ -552,7 +551,7 @@ void RequestOnSettingAsyncInstanceControl::CheckDynamicRequest( { isDynamic = asyncContext->isDynamic; if (!isDynamic) { - ACCESSTOKEN_LOG_INFO(LABEL, "It does not need to request permission exsion"); + LOGI(ATM_DOMAIN, ATM_TAG, "It does not need to request permission exsion."); PermissionResultsCallbackUI(asyncContext->stateList, asyncContext); return; } @@ -562,7 +561,7 @@ void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, ani_object aniContext, ani_array_ref permissionList, ani_object callback) { if (env == nullptr || permissionList == nullptr || callback == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env or permissionList or callback is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env or permissionList or callback is null."); return; } @@ -577,7 +576,7 @@ void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, ani_object result = reinterpret_cast(nullRef); static AccessTokenID selfTokenID = static_cast(GetSelfTokenID()); if (selfTokenID != asyncContext->tokenId) { - ACCESSTOKEN_LOG_ERROR(LABEL, "The context tokenID %{public}d is not same with selfTokenID %{public}d.", + LOGE(ATM_DOMAIN, ATM_TAG, "The context tokenID %{public}d is not same with selfTokenID %{public}d.", asyncContext->tokenId, selfTokenID); ani_object error = BusinessErrorAni::CreateError(env, STS_ERROR_PARAM_INVALID, GetErrorMessage(STS_ERROR_PARAM_INVALID, @@ -587,14 +586,14 @@ void RequestPermissionOnSettingExecute([[maybe_unused]] ani_env* env, } GetInstanceId(asyncContext); RequestOnSettingAsyncInstanceControl::AddCallbackByInstanceId(asyncContext); - ACCESSTOKEN_LOG_INFO(LABEL, "Start to pop ui extension dialog"); + LOGI(ATM_DOMAIN, ATM_TAG, "Start to pop ui extension dialog."); if (asyncContext->result.errorCode != RET_SUCCESS) { int32_t stsCode = TransferToStsErrorCode(asyncContext->result.errorCode); ani_object error = BusinessErrorAni::CreateError( env, stsCode, GetErrorMessage(stsCode, asyncContext->result.errorMsg)); ExecuteAsyncCallback(env, callback, error, result); - ACCESSTOKEN_LOG_WARN(LABEL, "Failed to pop uiextension dialog."); + LOGW(ATM_DOMAIN, ATM_TAG, "Failed to pop uiextension dialog."); } } } // namespace AccessToken diff --git a/frameworks/ets/ani/common/src/ani_error.cpp b/frameworks/ets/ani/common/src/ani_error.cpp index dcc1ce7ff..92f9bd091 100644 --- a/frameworks/ets/ani/common/src/ani_error.cpp +++ b/frameworks/ets/ani/common/src/ani_error.cpp @@ -17,15 +17,12 @@ #include #include "access_token_error.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "data_validator.h" namespace OHOS { namespace Security { namespace AccessToken { -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_PRIVACY, "CommonAni" }; -} // namespace constexpr const char* BUSINESS_ERROR_CLASS = "@ohos.base.BusinessError"; static const std::unordered_map g_errorStringMap = { { STS_ERROR_PERMISSION_DENIED, "Permission denied." }, @@ -62,7 +59,7 @@ void BusinessErrorAni::ThrowError(ani_env* env, int32_t err, const std::string& ani_object BusinessErrorAni::CreateError(ani_env* env, ani_int code, const std::string& msg) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env is nullptr"); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_class cls = nullptr; @@ -72,39 +69,39 @@ ani_object BusinessErrorAni::CreateError(ani_env* env, ani_int code, const std:: ani_status status = env->FindClass(BUSINESS_ERROR_CLASS, &cls); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass: %{public}d.", status); return nullptr; } status = env->Class_FindMethod(cls, "", ":", &method); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindMethod: %{public}d.", status); return nullptr; } status = env->Object_New(cls, method, &obj); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_New: %{public}d.", status); return nullptr; } status = env->Class_FindField(cls, "code", &field); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindField : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindField: %{public}d.", status); return nullptr; } status = env->Object_SetField_Int(obj, field, code); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_SetField_Int : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_SetField_Int : %{public}d.", status); return nullptr; } status = env->Class_FindField(cls, "data", &field); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindField : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindField: %{public}d.", status); return nullptr; } ani_string string = nullptr; env->String_NewUTF8(msg.c_str(), msg.size(), &string); status = env->Object_SetField_Ref(obj, field, static_cast(string)); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_SetField_Ref : %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_SetField_Ref: %{public}d.", status); return nullptr; } return obj; @@ -138,7 +135,7 @@ void BusinessErrorAni::ThrowParameterTypeError(ani_env* env, int32_t err, const void BusinessErrorAni::ThrowError(ani_env* env, ani_object err) { if (err == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "err is nullptr"); + LOGE(ATM_DOMAIN, ATM_TAG, "Err is null."); return; } env->ThrowError(static_cast(err)); @@ -189,7 +186,7 @@ int32_t BusinessErrorAni::GetStsErrorCode(int32_t errCode) stsCode = STS_ERROR_INNER; break; } - ACCESSTOKEN_LOG_DEBUG(LABEL, "GetStsErrorCode nativeCode(%{public}d) stsCode(%{public}d).", errCode, stsCode); + LOGD(ATM_DOMAIN, ATM_TAG, "GetStsErrorCode nativeCode(%{public}d) stsCode(%{public}d).", errCode, stsCode); return stsCode; } diff --git a/frameworks/ets/ani/common/src/ani_utils.cpp b/frameworks/ets/ani/common/src/ani_utils.cpp index be0492cdb..85af81a7a 100644 --- a/frameworks/ets/ani/common/src/ani_utils.cpp +++ b/frameworks/ets/ani/common/src/ani_utils.cpp @@ -13,25 +13,21 @@ * limitations under the License. */ #include "ani_utils.h" - -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" namespace OHOS { namespace Security { namespace AccessToken { -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AccessTokenAniUtils" }; -} // namespace bool AniFindNameSpace(ani_env* env, const std::string& namespaceDescriptor, ani_namespace& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->FindNamespace(namespaceDescriptor.c_str(), &out) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindNamespace failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindNamespace!"); return false; } return true; @@ -40,12 +36,12 @@ bool AniFindNameSpace(ani_env* env, const std::string& namespaceDescriptor, ani_ bool AniFindClass(ani_env* env, const std::string& classDescriptor, ani_class& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->FindClass(classDescriptor.c_str(), &out) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass(%{public}s) failed.", classDescriptor.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass(%{public}s).", classDescriptor.c_str()); return false; } return true; @@ -56,12 +52,12 @@ bool AniClassFindMethod( const std::string& signature, ani_method& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->Class_FindMethod(aniClass, methodDescriptor.c_str(), signature.c_str(), &out) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindMethod!"); return false; } return true; @@ -70,12 +66,12 @@ bool AniClassFindMethod( bool AniClassFindField(ani_env* env, const ani_class& aniClass, const char *fieldName, ani_field& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->Class_FindField(aniClass, fieldName, &out) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindField failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Class_FindField failed!"); return false; } return true; @@ -84,7 +80,7 @@ bool AniClassFindField(ani_env* env, const ani_class& aniClass, const char *fiel bool AniParseUint32(ani_env* env, const ani_ref& aniInt, uint32_t& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } @@ -92,7 +88,7 @@ bool AniParseUint32(ani_env* env, const ani_ref& aniInt, uint32_t& out) ani_status status; if ((status = env->Object_CallMethodByName_Int( static_cast(aniInt), "unboxed", nullptr, &tmp)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_CallMethodByName_Int failed! %{public}d", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Object_CallMethodByName_Int failed! %{public}d.", status); return false; } @@ -103,20 +99,20 @@ bool AniParseUint32(ani_env* env, const ani_ref& aniInt, uint32_t& out) bool AniParseAccessTokenIDArray(ani_env* env, const ani_array_ref& array, std::vector& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_size size; if (env->Array_GetLength(array, &size) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_GetLength failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_GetLength!"); return false; } 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); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_Get_Ref at index %{public}zu!", i); return false; } uint32_t value; @@ -135,19 +131,19 @@ std::vector ParseAniStringVector(ani_env* env, const ani_array_ref& { std::vector out; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return out; } ani_size size = 0; if (env->Array_GetLength(aniStrArr, &size) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_GetLength failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_GetLength!"); return out; } 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!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_Get_Ref!"); return out; } @@ -162,12 +158,12 @@ std::vector ParseAniStringVector(ani_env* env, const ani_array_ref& bool AniParseCallback(ani_env* env, const ani_ref& aniCallback, ani_ref& out) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->GlobalReference_Create(aniCallback, &out) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GlobalReference_Create failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GlobalReference_Create!"); return false; } return true; @@ -176,13 +172,13 @@ bool AniParseCallback(ani_env* env, const ani_ref& aniCallback, ani_ref& out) bool AniIsRefUndefined(ani_env* env, const ani_ref& ref) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_boolean isUnd; if (env->Reference_IsUndefined(ref, &isUnd) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Reference_IsUndefined failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Reference_IsUndefined!"); return false; } return isUnd ? true : false; @@ -192,12 +188,12 @@ ani_string CreateAniString(ani_env* env, const std::string& str) { ani_string aniStr = {}; if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return aniStr; } if (env->String_NewUTF8(str.c_str(), str.size(), &aniStr) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "String_NewUTF8 failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to String_NewUTF8!"); return aniStr; } return aniStr; @@ -212,7 +208,7 @@ bool AniIsCallbackRefEqual(ani_env* env, const ani_ref& compareRef, const ani_re bool& isEqual) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } @@ -222,7 +218,7 @@ bool AniIsCallbackRefEqual(ani_env* env, const ani_ref& compareRef, const ani_re ani_boolean isEq = false; if (env->Reference_StrictEquals(compareRef, targetRref, &isEq) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Reference_StrictEquals failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Reference_StrictEquals."); return false; } isEqual = isEq ? true : false; @@ -232,12 +228,12 @@ bool AniIsCallbackRefEqual(ani_env* env, const ani_ref& compareRef, const ani_re bool AniFunctionalObjectCall(ani_env *env, const ani_fn_object& fn, ani_size size, ani_ref* argv, ani_ref& result) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } if (env->FunctionalObject_Call(fn, size, argv, &result) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "AniFunctionalObjectCall failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to AniFunctionalObjectCall."); return false; } return true; @@ -246,20 +242,20 @@ bool AniFunctionalObjectCall(ani_env *env, const ani_fn_object& fn, ani_size siz std::string ParseAniString(ani_env* env, ani_string aniStr) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return ""; } ani_size strSize; if (env->String_GetUTF8Size(aniStr, &strSize) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "String_GetUTF8Size error."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to String_GetUTF8Size."); return ""; } std::vector buffer(strSize + 1); char* utf8Buffer = buffer.data(); ani_size bytesWritten = 0; if (env->String_GetUTF8(aniStr, utf8Buffer, strSize + 1, &bytesWritten) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "String_GetUTF8 error."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to String_GetUTF8."); return ""; } @@ -271,7 +267,7 @@ std::string ParseAniString(ani_env* env, ani_string aniStr) ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArray) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } @@ -279,16 +275,16 @@ ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArra ani_array_ref aArrayRef = nullptr; ani_class aStringcls = nullptr; if (env->FindClass("std.core.String", &aStringcls) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass String failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass String."); return nullptr; } ani_ref undefinedRef = nullptr; if (ANI_OK != env->GetUndefined(&undefinedRef)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetUndefined failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GetUndefined."); return nullptr; } if (env->Array_New_Ref(aStringcls, length, undefinedRef, &aArrayRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_New_Ref failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_New_Ref."); return nullptr; } ani_string aString = nullptr; @@ -298,7 +294,7 @@ ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArra } ani_ref aRef = nullptr; if (env->GlobalReference_Create(aArrayRef, &aRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GlobalReference_Create failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GlobalReference_Create."); return nullptr; } return aRef; @@ -307,14 +303,14 @@ ani_ref CreateAniArrayString(ani_env* env, const std::vector& cArra ani_ref CreateAniArrayInt(ani_env* env, const std::vector& cArray) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_size length = cArray.size(); ani_array_int aArrayInt = nullptr; if (env->Array_New_Int(length, &aArrayInt) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_New_Int failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_New_Int."); return nullptr; } for (ani_size i = 0; i < length; ++i) { @@ -322,7 +318,7 @@ ani_ref CreateAniArrayInt(ani_env* env, const std::vector& cArray) } ani_ref aRef = nullptr; if (env->GlobalReference_Create(aArrayInt, &aRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GlobalReference_Create failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GlobalReference_Create."); return nullptr; } return aRef; @@ -331,14 +327,14 @@ ani_ref CreateAniArrayInt(ani_env* env, const std::vector& cArray) ani_ref CreateAniArrayBool(ani_env* env, const std::vector& cArray) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_size length = cArray.size(); ani_array_boolean aArrayBool = nullptr; if (env->Array_New_Boolean(length, &aArrayBool) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Array_New_Boolean failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Array_New_Boolean."); return nullptr; } std::vector boolArray(length); @@ -350,7 +346,7 @@ ani_ref CreateAniArrayBool(ani_env* env, const std::vector& cArray) } ani_ref aRef = nullptr; if (env->GlobalReference_Create(aArrayBool, &aRef) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GlobalReference_Create failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to GlobalReference_Create."); return nullptr; } return aRef; @@ -359,7 +355,7 @@ ani_ref CreateAniArrayBool(ani_env* env, const std::vector& cArray) void DeleteReference(ani_env* env, ani_ref& ref) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); ref = nullptr; return; } @@ -373,24 +369,24 @@ void DeleteReference(ani_env* env, ani_ref& ref) ani_object CreateBooleanObject(ani_env *env, bool value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_class persionCls; ani_status status = ANI_ERROR; if ((status = env->FindClass("std.core.Boolean", &persionCls)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass, status : %{public}d.", static_cast(status)); return nullptr; } ani_method personInfoCtor; if ((status = env->Class_FindMethod(persionCls, "", "z:", &personInfoCtor)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindMethod, status : %{public}d.", static_cast(status)); return nullptr; } ani_object personInfoObj; if ((status = env->Object_New(persionCls, personInfoCtor, &personInfoObj, value)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_New, status : %{public}d.", static_cast(status)); return nullptr; } return personInfoObj; @@ -399,24 +395,24 @@ ani_object CreateBooleanObject(ani_env *env, bool value) ani_object CreateIntObject(ani_env *env, int32_t value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_class persionCls; ani_status status = ANI_ERROR; if ((status = env->FindClass("std.core.Int", &persionCls)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass, status : %{public}d.", static_cast(status)); return nullptr; } ani_method aniMethod; if ((status = env->Class_FindMethod(persionCls, "", "i:", &aniMethod)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindMethod, status : %{public}d.", static_cast(status)); return nullptr; } ani_object aniObject; if ((status = env->Object_New(persionCls, aniMethod, &aniObject, value)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_New, status : %{public}d.", static_cast(status)); return nullptr; } return aniObject; @@ -425,26 +421,26 @@ ani_object CreateIntObject(ani_env *env, int32_t value) ani_object CreateClassObject(ani_env* env, const std::string& classDescriptor) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } ani_class aniClass; ani_status status = ANI_ERROR; if ((status = env->FindClass(classDescriptor.c_str(), &aniClass)) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindClass fail, status : %{public}d.", static_cast(status)); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindClass, status : %{public}d.", static_cast(status)); return nullptr; } ani_method aniMethod; status = env->Class_FindMethod(aniClass, "", ":", &aniMethod); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Class_FindMethod failed, status: %{public}d!", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Class_FindMethod, status: %{public}d!", status); return nullptr; } ani_object out; status = env->Object_New(aniClass, aniMethod, &out); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New failed, status %{public}d!", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_New, status %{public}d!", status); return nullptr; } return out; @@ -453,7 +449,7 @@ ani_object CreateClassObject(ani_env* env, const std::string& classDescriptor) ani_object CreateArrayObject(ani_env* env, uint32_t length) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return nullptr; } @@ -464,13 +460,13 @@ ani_object CreateArrayObject(ani_env* env, uint32_t length) ani_method aniMethod; ani_status status = env->Class_FindMethod(aniClass, "", "i:", &aniMethod); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindMethod failed, status: %{public}d!", status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindMethod, status: %{public}d!", status); return nullptr; } ani_object out; status = env->Object_New(aniClass, aniMethod, &out, length); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object_New failed(size: %{public}d), status %{public}d!", length, status); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Object_New(size: %{public}d), status %{public}d!", length, status); return nullptr; } return out; @@ -479,14 +475,14 @@ ani_object CreateArrayObject(ani_env* env, uint32_t length) bool GetBoolProperty(ani_env* env, const ani_object& object, const std::string& property, bool& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d!", property.c_str(), status); return false; } @@ -496,7 +492,7 @@ bool GetBoolProperty(ani_env* env, const ani_object& object, const std::string& ani_boolean boolValue; if (env->Object_CallMethodByName_Boolean(static_cast(ref), "unboxed", nullptr, &boolValue) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get bool value of property(%{public}s) failed.", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get bool value of property(%{public}s).", property.c_str()); return false; } value = static_cast(boolValue); @@ -506,26 +502,26 @@ bool GetBoolProperty(ani_env* env, const ani_object& object, const std::string& bool GetIntProperty(ani_env* env, const ani_object& object, const std::string& property, int32_t& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d.", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d.", property.c_str(), static_cast(status)); return false; } if (AniIsRefUndefined(env, ref)) { - ACCESSTOKEN_LOG_INFO(LABEL, "Property(%{public}s) is undefned!", property.c_str()); + LOGI(ATM_DOMAIN, ATM_TAG, "Property(%{public}s) is undefned!", property.c_str()); return true; } ani_int intValue; status = env->Object_CallMethodByName_Int(static_cast(ref), "unboxed", nullptr, &intValue); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get int value of property(%{public}s) failed, status: %{public}d.", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get int value of property(%{public}s), status: %{public}d.", property.c_str(), static_cast(status)); return false; } @@ -536,14 +532,14 @@ bool GetIntProperty(ani_env* env, const ani_object& object, const std::string& p bool GetLongProperty(ani_env* env, const ani_object& object, const std::string& property, int64_t& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d!", property.c_str(), status); return false; } @@ -553,7 +549,7 @@ bool GetLongProperty(ani_env* env, const ani_object& object, const std::string& ani_long longValue; if (env->Object_CallMethodByName_Long(static_cast(ref), "unboxed", nullptr, &longValue) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get int64 value of property(%{public}s) failed.", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get int64 value of property(%{public}s).", property.c_str()); return false; } value = static_cast(longValue); @@ -563,14 +559,14 @@ bool GetLongProperty(ani_env* env, const ani_object& object, const std::string& bool GetStringProperty(ani_env* env, const ani_object& object, const std::string& property, std::string& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d!", property.c_str(), status); return false; } @@ -584,14 +580,14 @@ bool GetStringProperty(ani_env* env, const ani_object& object, const std::string bool GetEnumProperty(ani_env* env, const ani_object& object, const std::string& property, int32_t& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d!", property.c_str(), status); return false; } @@ -601,7 +597,7 @@ bool GetEnumProperty(ani_env* env, const ani_object& object, const std::string& ani_enum_item aniEnum = static_cast(ref); ani_int aniInt; if (env->EnumItem_GetValue_Int(aniEnum, &aniInt) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get enum value of property(%{public}s) failed.", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get enum value of property(%{public}s).", property.c_str()); return false; } value = static_cast(aniInt); @@ -612,14 +608,14 @@ bool GetStringVecProperty( ani_env* env, const ani_object& object, const std::string& property, std::vector& value) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); return false; } ani_ref ref; ani_status status = env->Object_GetPropertyByName_Ref(object, property.c_str(), &ref); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to get property(%{public}s), status: %{public}d!", property.c_str(), status); return false; } @@ -634,12 +630,12 @@ bool GetStringVecProperty( bool SetBoolProperty(ani_env* env, ani_object& object, const std::string& property, bool in) { if ((env == nullptr) || (object == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is nullptr, property(%{public}s).", property.c_str()); return false; } ani_status status = env->Object_SetPropertyByName_Boolean(object, property.c_str(), static_cast(in)); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Set property(%{public}s) failed, status: %{public}d!", property.c_str(), status); return false; } @@ -649,12 +645,12 @@ bool SetBoolProperty(ani_env* env, ani_object& object, const std::string& proper bool SetIntProperty(ani_env* env, ani_object& object, const std::string& property, int32_t in) { if ((env == nullptr) || (object == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is nullptr, property(%{public}s).", property.c_str()); return false; } ani_status status = env->Object_SetPropertyByName_Int(object, property.c_str(), static_cast(in)); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Set property(%{public}s) failed, status: %{public}d!", property.c_str(), status); return false; } @@ -664,12 +660,12 @@ bool SetIntProperty(ani_env* env, ani_object& object, const std::string& propert bool SetLongProperty(ani_env* env, ani_object& aniObject, const std::string& property, int64_t in) { if ((env == nullptr) || (aniObject == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is nullptr, property(%{public}s).", property.c_str()); return false; } ani_status status = env->Object_SetPropertyByName_Long(aniObject, property.c_str(), static_cast(in)); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Set property(%{public}s) failed, status: %{public}d!", property.c_str(), status); return false; } @@ -679,12 +675,12 @@ bool SetLongProperty(ani_env* env, ani_object& aniObject, const std::string& pro bool SetRefProperty(ani_env* env, ani_object& aniObject, const std::string& property, const ani_ref& in) { if ((env == nullptr) || (aniObject == nullptr) || (in == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is nullptr, property(%{public}s).", property.c_str()); return false; } ani_status status = env->Object_SetPropertyByName_Ref(aniObject, property.c_str(), in); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set property(%{public}s) failed, status: %{public}d!", + LOGE(ATM_DOMAIN, ATM_TAG, "Set property(%{public}s) failed, status: %{public}d!", property.c_str(), status); return false; } @@ -694,7 +690,7 @@ bool SetRefProperty(ani_env* env, ani_object& aniObject, const std::string& prop bool SetOptionalIntProperty(ani_env* env, ani_object& aniObject, const std::string& property, int32_t in) { if ((env == nullptr) || (aniObject == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is nullptr, property(%{public}s).", property.c_str()); return false; } ani_object intObject = CreateIntObject(env, in); @@ -712,7 +708,7 @@ bool SetOptionalIntProperty(ani_env* env, ani_object& aniObject, const std::stri bool SetStringProperty(ani_env* env, ani_object& aniObject, const std::string& property, const std::string& in) { if ((env == nullptr) || (aniObject == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is null, property(%{public}s).", property.c_str()); return false; } ani_ref aniString = static_cast(CreateAniString(env, in)); @@ -726,17 +722,17 @@ bool SetEnumProperty(ani_env* env, ani_object& aniObject, const std::string& enumDescription, const std::string& property, uint32_t value) { if ((env == nullptr) || (aniObject == nullptr)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param is nullptr, property(%{public}s).", property.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param is null, property(%{public}s).", property.c_str()); return false; } ani_enum aniEnum; if (env->FindEnum(enumDescription.c_str(), &aniEnum) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindEnum failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to FindEnum!"); return false; } ani_enum_item aniEnumItem; if (env->Enum_GetEnumItemByIndex(aniEnum, static_cast(value), &aniEnumItem) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Enum_GetEnumItemByIndex failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to Enum_GetEnumItemByIndex!"); return false; } if (!SetRefProperty(env, aniObject, property.c_str(), aniEnumItem)) { @@ -748,7 +744,7 @@ bool SetEnumProperty(ani_env* env, ani_object& aniObject, ani_env* GetCurrentEnv(ani_vm* vm) { if (vm == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Vm is nullptr."); + LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); return nullptr; } ani_env* env = nullptr; diff --git a/frameworks/ets/ani/privacy/src/privacy_manager.cpp b/frameworks/ets/ani/privacy/src/privacy_manager.cpp index 55100191f..50eff8881 100644 --- a/frameworks/ets/ani/privacy/src/privacy_manager.cpp +++ b/frameworks/ets/ani/privacy/src/privacy_manager.cpp @@ -17,7 +17,7 @@ #include -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "ani_error.h" #include "ani_utils.h" #include "privacy_error.h" @@ -27,7 +27,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_PRIVACY, "AniPrivacyManager" }; std::mutex g_mutex; std::vector g_subScribers; static constexpr size_t MAX_CALLBACK_SIZE = 200; @@ -86,7 +85,7 @@ static int32_t GetStsErrorCode(int32_t errCode) stsCode = STS_ERROR_INNER; break; } - ACCESSTOKEN_LOG_DEBUG(LABEL, "GetStsErrorCode nativeCode(%{public}d) stsCode(%{public}d).", errCode, stsCode); + LOGD(PRI_DOMAIN, PRI_TAG, "GetStsErrorCode nativeCode(%{public}d) stsCode(%{public}d).", errCode, stsCode); return stsCode; } @@ -100,7 +99,7 @@ static void AddPermissionUsedRecordExecute([[maybe_unused]] ani_env* env, std::string permission = ParseAniString(env, aniPermission); if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", + LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); return; } @@ -130,13 +129,13 @@ PermActiveStatusPtr::PermActiveStatusPtr(const std::vector& permLis PermActiveStatusPtr::~PermActiveStatusPtr() { if (vm_ == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "vm is nullptr;"); + LOGE(PRI_DOMAIN, PRI_TAG, "Vm is null."); return; } bool isSameThread = (threadId_ == std::this_thread::get_id()); ani_env* env = isSameThread ? env_ : GetCurrentEnv(vm_); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Current env is nulltpr."); + LOGE(PRI_DOMAIN, PRI_TAG, "Current env is null."); } else if (ref_ != nullptr) { env->GlobalReference_Delete(ref_); } @@ -201,7 +200,7 @@ static ani_object ConvertActiveChangeResponse(ani_env* env, const ActiveChangeRe void PermActiveStatusPtr::ActiveStatusChangeCallback(ActiveChangeResponse& activeChangeResponse) { if (vm_ == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "vm is nullptr;"); + LOGE(PRI_DOMAIN, PRI_TAG, "Vm is null."); return; } @@ -209,19 +208,19 @@ void PermActiveStatusPtr::ActiveStatusChangeCallback(ActiveChangeResponse& activ ani_options aniArgs {1, &interopEnabled}; ani_env* env; if (vm_->AttachCurrentThread(&aniArgs, ANI_VERSION_1, &env) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "AttachCurrentThread failed!"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to AttachCurrentThread!"); return; } ani_fn_object fnObj = reinterpret_cast(ref_); if (fnObj == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Reinterpret_cast failed!"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to Reinterpret_cast!"); return; } ani_object aniObject = ConvertActiveChangeResponse(env, activeChangeResponse); if (aniObject == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Convert object is null."); + LOGE(PRI_DOMAIN, PRI_TAG, "Convert object is null."); return; } std::vector args; @@ -232,7 +231,7 @@ void PermActiveStatusPtr::ActiveStatusChangeCallback(ActiveChangeResponse& activ } if (vm_->DetachCurrentThread() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "DetachCurrentThread failed!"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to DetachCurrentThread!"); return; } } @@ -260,7 +259,7 @@ static bool ParseInputToRegister(const ani_string& aniType, const ani_array_ref& ani_vm* vm; if (context->env->GetVM(&vm) != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetVM failed!"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to GetVM!"); return false; } @@ -322,7 +321,7 @@ static void RegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, RegisterPermActiveChangeContext* context = new (std::nothrow) RegisterPermActiveChangeContext(); if (context == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to allocate memory for RegisterPermActiveChangeContext!"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to allocate memory for RegisterPermActiveChangeContext!"); return; } context->env = env; @@ -342,7 +341,7 @@ static void RegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, int32_t result = PrivacyKit::RegisterPermActiveStatusCallback(context->subscriber); if (result != RET_SUCCESS) { - ACCESSTOKEN_LOG_ERROR(LABEL, "RegisterPermActiveStatusCallback failed, res is %{public}d", result); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to RegisterPermActiveStatusCallback, res is %{public}d.", result); int32_t stsCode = GetStsErrorCode(result); BusinessErrorAni::ThrowError(env, stsCode, GetErrorMessage(stsCode)); return; @@ -351,7 +350,7 @@ static void RegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, { std::lock_guard lock(g_mutex); if (g_subScribers.size() >= MAX_CALLBACK_SIZE) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Subscribers size has reached the max %{public}zu.", MAX_CALLBACK_SIZE); + LOGE(PRI_DOMAIN, PRI_TAG, "Subscribers size has reached the max %{public}zu.", MAX_CALLBACK_SIZE); BusinessErrorAni::ThrowError(env, STSErrorCode::STS_ERROR_REGISTERS_EXCEED_LIMITATION, GetErrorMessage(STSErrorCode::STS_ERROR_REGISTERS_EXCEED_LIMITATION)); return; @@ -360,7 +359,7 @@ static void RegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, } callbackPtr.release(); - ACCESSTOKEN_LOG_INFO(LABEL, "RegisterPermActiveStatusCallback success!"); + LOGI(PRI_DOMAIN, PRI_TAG, "RegisterPermActiveStatusCallback success!"); return; } @@ -379,10 +378,10 @@ static bool FindAndGetSubscriber(const RegisterPermActiveChangeContext* context, // targetCallback != nullptr, unregister the subscriber with same permList and callback if (isUndef) { // batch delete currentThread callback - ACCESSTOKEN_LOG_INFO(LABEL, "Callback is nullptr."); + LOGI(PRI_DOMAIN, PRI_TAG, "Callback is null."); callbackEqual = IsCurrentThread(item->threadId); } else { - ACCESSTOKEN_LOG_INFO(LABEL, "Compare callback."); + LOGI(PRI_DOMAIN, PRI_TAG, "Compare callback."); if (!AniIsCallbackRefEqual(context->env, item->callbackRef, callbackRef, item->threadId, callbackEqual)) { continue; } @@ -458,21 +457,21 @@ static void UnRegisterPermActiveStatusCallback([[maybe_unused]] ani_env* env, if (result == RET_SUCCESS) { DeleteRegisterInVector(item); } else { - ACCESSTOKEN_LOG_ERROR(LABEL, "UnregisterPermActiveChangeCompleted failed"); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to UnregisterPermActiveChangeCompleted!"); int32_t stsCode = GetStsErrorCode(result); BusinessErrorAni::ThrowError(env, stsCode, GetErrorMessage(stsCode)); } } - ACCESSTOKEN_LOG_INFO(LABEL, "UnRegisterPermActiveStatusCallback success!"); + LOGI(PRI_DOMAIN, PRI_TAG, "UnRegisterPermActiveStatusCallback success!"); return; } static void StopUsingPermissionExecute( [[maybe_unused]] ani_env* env, ani_int aniTokenID, ani_string aniPermission, ani_int pid) { - ACCESSTOKEN_LOG_INFO(LABEL, "StopUsingPermissionExecute begin."); + LOGI(PRI_DOMAIN, PRI_TAG, "StopUsingPermissionExecute begin."); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "env null"); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return; } @@ -480,12 +479,12 @@ static void StopUsingPermissionExecute( std::string permission = ParseAniString(env, aniPermission); if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", + LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); return; } - ACCESSTOKEN_LOG_INFO(LABEL, "PermissionName : %{public}s, tokenID : %{public}u, pid : %{public}d", + LOGI(PRI_DOMAIN, PRI_TAG, "PermissionName : %{public}s, tokenID : %{public}u, pid : %{public}d.", permission.c_str(), tokenID, pid); auto retCode = PrivacyKit::StopUsingPermission(tokenID, permission, pid); @@ -498,21 +497,21 @@ static void StopUsingPermissionExecute( static void StartUsingPermissionExecute([[maybe_unused]] ani_env* env, ani_int aniTokenID, ani_string aniPermission, ani_int pid, PermissionUsedType usedType) { - ACCESSTOKEN_LOG_INFO(LABEL, "StartUsingPermissionExecute begin."); + LOGI(PRI_DOMAIN, PRI_TAG, "StartUsingPermissionExecute begin."); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env null"); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return; } AccessTokenID tokenID = static_cast(aniTokenID); std::string permission = ParseAniString(env, aniPermission); if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", + LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); return; } - ACCESSTOKEN_LOG_INFO(LABEL, "PermissionName : %{public}s, tokenID : %{public}u, pid : %{public}d", + LOGI(PRI_DOMAIN, PRI_TAG, "PermissionName : %{public}s, tokenID : %{public}u, pid : %{public}d.", permission.c_str(), tokenID, pid); auto retCode = PrivacyKit::StartUsingPermission(tokenID, permission, pid, usedType); @@ -560,13 +559,13 @@ static ani_object ConvertUsedRecordDetails(ani_env* env, const std::vectorObject_CallMethodByName_Void( arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "status : %{public}d", status); + LOGE(PRI_DOMAIN, PRI_TAG, "Status : %{public}d.", status); break; } ++index; @@ -622,8 +621,8 @@ static ani_ref ConvertPermissionRecords(ani_env* env, const std::vectorObject_CallMethodByName_Void( arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR( - LABEL, "Set permission record fail, status: %{public}d.", static_cast(status)); + LOGE(PRI_DOMAIN, PRI_TAG, + "Failed to Set permission record, status: %{public}d.", static_cast(status)); break; } ++index; @@ -668,13 +667,14 @@ static ani_object ConvertBundleUsedRecords(ani_env* env, const std::vectorObject_CallMethodByName_Void( arrayObj, "$_set", "iC{std.core.Object}:", index, aniRecord); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set bundle record fail, status: %{public}d.", static_cast(status)); + LOGE(PRI_DOMAIN, PRI_TAG, + "Failed to set bundle record fail, status: %{public}d.", static_cast(status)); continue; } ++index; @@ -712,7 +712,7 @@ static bool ParseRequest(ani_env* env, const ani_object& aniRequest, PermissionU return false; } if (!isRequestObject) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Object is not request type."); + LOGE(PRI_DOMAIN, PRI_TAG, "Object is not request type."); return false; } @@ -756,8 +756,9 @@ static bool ParseRequest(ani_env* env, const ani_object& aniRequest, PermissionU static ani_object GetPermissionUsedRecordExecute([[maybe_unused]] ani_env* env, ani_object aniRequest) { - ACCESSTOKEN_LOG_INFO(LABEL, "GetPermissionUsedRecordExecute Call"); + LOGI(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedRecordExecute Call."); if (env == nullptr || aniRequest == nullptr) { + LOGE(PRI_DOMAIN, PRI_TAG, "Env or aniRequest is null."); return nullptr; } @@ -783,16 +784,16 @@ static ani_object ConvertPermissionUsedTypeInfo(ani_env *env, const PermissionUs return nullptr; } if (!SetIntProperty(env, aObject, "tokenId", info.tokenId)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "tokenId set fail."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to set tokenId."); return nullptr; } if (!SetStringProperty(env, aObject, "permissionName", info.permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName set fail."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to set PermissionName."); return nullptr; } const char* permUsedTypeDes = "@ohos.privacyManager.privacyManager.PermissionUsedType"; if (!SetEnumProperty(env, aObject, permUsedTypeDes, "usedType", static_cast(info.type))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "UsedType set fail."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to set UsedType."); return nullptr; } return aObject; @@ -808,13 +809,13 @@ static ani_ref ConvertPermissionUsedTypeInfos(ani_env* env, const std::vectorObject_CallMethodByName_Void( arrayObj, "$_set", "iC{std.core.Object}:", index, aniType); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Set type fail, status: %{public}d.", static_cast(status)); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to Set type, status: %{public}d.", static_cast(status)); continue; } ++index; @@ -826,7 +827,7 @@ static ani_ref GetPermissionUsedTypeInfosExecute([[maybe_unused]] ani_env* env, ani_int aniTokenID, ani_string aniPermission) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null."); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return nullptr; } AccessTokenID tokenID = static_cast(aniTokenID); @@ -844,7 +845,7 @@ static ani_ref GetPermissionUsedTypeInfosExecute([[maybe_unused]] ani_env* env, static void SetPermissionUsedRecordToggleStatusExecute([[maybe_unused]] ani_env* env, ani_boolean status) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null."); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return; } int32_t userID = 0; @@ -858,7 +859,7 @@ static void SetPermissionUsedRecordToggleStatusExecute([[maybe_unused]] ani_env* static ani_boolean GetPermissionUsedRecordToggleStatusExecute([[maybe_unused]] ani_env* env) { if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null."); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return false; } int32_t userID = 0; @@ -873,18 +874,18 @@ static ani_boolean GetPermissionUsedRecordToggleStatusExecute([[maybe_unused]] a void InitPrivacyFunction(ani_env *env) { - ACCESSTOKEN_LOG_INFO(LABEL, "InitPrivacyFunction call"); + LOGI(PRI_DOMAIN, PRI_TAG, "InitPrivacyFunction call."); if (env == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Env is null."); + LOGE(PRI_DOMAIN, PRI_TAG, "Env is null."); return; } if (env->ResetError() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ResetError failed."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to ResetError."); } ani_namespace ns; if (ANI_OK != env->FindNamespace("@ohos.privacyManager.privacyManager", &ns)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "FindNamespace privacyManager failed."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to FindNamespace privacyManager."); return; } @@ -909,30 +910,30 @@ void InitPrivacyFunction(ani_env *env) }; ani_status status = env->Namespace_BindNativeFunctions(ns, nsMethods.data(), nsMethods.size()); if (status != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Namespace_BindNativeFunctions failed status : %{public}d.", status); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to Namespace_BindNativeFunctions status : %{public}d.", status); } if (env->ResetError() != ANI_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ResetError failed."); + LOGE(PRI_DOMAIN, PRI_TAG, "Failed to ResetError."); } - ACCESSTOKEN_LOG_INFO(LABEL, "InitPrivacyFunction end"); + LOGI(PRI_DOMAIN, PRI_TAG, "InitPrivacyFunction end."); } extern "C" { ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) { - ACCESSTOKEN_LOG_INFO(LABEL, "ANI_Constructor begin"); + LOGI(PRI_DOMAIN, PRI_TAG, "ANI_Constructor begin."); if (vm == nullptr || result == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "nullptr vm or result"); + LOGE(PRI_DOMAIN, PRI_TAG, "Vm or result is null."); return ANI_INVALID_ARGS; } ani_env* env; if (ANI_OK != vm->GetEnv(ANI_VERSION_1, &env)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Unsupported ANI_VERSION_1"); + LOGE(PRI_DOMAIN, PRI_TAG, "Unsupported ANI_VERSION_1."); return ANI_OUT_OF_MEMORY; } InitPrivacyFunction(env); *result = ANI_VERSION_1; - ACCESSTOKEN_LOG_INFO(LABEL, "ANI_Constructor end"); + LOGI(PRI_DOMAIN, PRI_TAG, "ANI_Constructor end."); return ANI_OK; } } -- Gitee