优化RequestPermissionsFromUserExcute的SelfTokenID获取操作&&移除无用依赖20241219

Signed-off-by: wuliushuan <wuliushuan.30044128@huawei.com>
Change-Id: I4d8e45287aec060832444343ed01dd5b534a1054
This commit is contained in:
wuliushuan
2024-12-19 15:53:00 +08:00
parent 6d44b5acf8
commit cbd2d374d4
3 changed files with 5 additions and 6 deletions
@@ -685,7 +685,7 @@ void NapiRequestPermission::RequestPermissionsFromUserExecute(napi_env env, void
{
// asyncContext release in complete
RequestAsyncContextHandle* asyncContextHandle = reinterpret_cast<RequestAsyncContextHandle*>(data);
AccessTokenID selfTokenID = static_cast<AccessTokenID>(GetSelfTokenID());
static AccessTokenID selfTokenID = static_cast<AccessTokenID>(GetSelfTokenID());
if (asyncContextHandle->asyncContextPtr->tokenId != selfTokenID) {
ACCESSTOKEN_LOG_ERROR(LABEL, "The context tokenID: %{public}d, selfTokenID: %{public}d.",
asyncContextHandle->asyncContextPtr->tokenId, selfTokenID);
@@ -60,7 +60,6 @@ if (is_standard_system) {
]
deps = [
":libtokenid_sdk",
"${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx",
"${access_token_path}/frameworks/common:accesstoken_common_cxx",
"${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc",
@@ -204,7 +204,7 @@ void PermissionDataBrief::GetPermStatusListByTokenId(AccessTokenID tokenID,
PermUsedTypeEnum PermissionDataBrief::GetPermissionUsedType(AccessTokenID tokenID, int32_t opCode)
{
Utils::UniqueWriteGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
Utils::UniqueReadGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
auto iter = requestedPermData_.find(tokenID);
if (iter == requestedPermData_.end()) {
ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is not exist %{public}d.", tokenID);
@@ -241,7 +241,7 @@ int32_t PermissionDataBrief::VerifyPermissionStatus(AccessTokenID tokenID, const
return PERMISSION_DENIED;
}
Utils::UniqueWriteGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
Utils::UniqueReadGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
auto iter = requestedPermData_.find(tokenID);
if (iter == requestedPermData_.end()) {
ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is not exist %{public}d.", tokenID);
@@ -280,7 +280,7 @@ bool PermissionDataBrief::IsPermissionGrantedWithSecComp(AccessTokenID tokenID,
return false;
}
Utils::UniqueWriteGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
Utils::UniqueReadGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
auto iter = requestedPermData_.find(tokenID);
if (iter == requestedPermData_.end()) {
ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is not exist %{public}d.", tokenID);
@@ -313,7 +313,7 @@ int32_t PermissionDataBrief::QueryPermissionFlag(AccessTokenID tokenID, const st
return AccessTokenError::ERR_PERMISSION_NOT_EXIST;
}
Utils::UniqueWriteGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
Utils::UniqueReadGuard<Utils::RWLock> infoGuard(this->permissionStateDataLock_);
auto iter = requestedPermData_.find(tokenID);
if (iter == requestedPermData_.end()) {
ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid %{public}u.", tokenID);