diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index add0e5ea5..72b3ef84b 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -685,7 +685,7 @@ void NapiRequestPermission::RequestPermissionsFromUserExecute(napi_env env, void { // asyncContext release in complete RequestAsyncContextHandle* asyncContextHandle = reinterpret_cast(data); - AccessTokenID selfTokenID = static_cast(GetSelfTokenID()); + static AccessTokenID selfTokenID = static_cast(GetSelfTokenID()); if (asyncContextHandle->asyncContextPtr->tokenId != selfTokenID) { ACCESSTOKEN_LOG_ERROR(LABEL, "The context tokenID: %{public}d, selfTokenID: %{public}d.", asyncContextHandle->asyncContextPtr->tokenId, selfTokenID); diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn index 18196c4c5..72f24f1d6 100644 --- a/interfaces/innerkits/accesstoken/BUILD.gn +++ b/interfaces/innerkits/accesstoken/BUILD.gn @@ -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", diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp index 32ad42a26..1914fe401 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp @@ -204,7 +204,7 @@ void PermissionDataBrief::GetPermStatusListByTokenId(AccessTokenID tokenID, PermUsedTypeEnum PermissionDataBrief::GetPermissionUsedType(AccessTokenID tokenID, int32_t opCode) { - Utils::UniqueWriteGuard infoGuard(this->permissionStateDataLock_); + Utils::UniqueReadGuard 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 infoGuard(this->permissionStateDataLock_); + Utils::UniqueReadGuard 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 infoGuard(this->permissionStateDataLock_); + Utils::UniqueReadGuard 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 infoGuard(this->permissionStateDataLock_); + Utils::UniqueReadGuard infoGuard(this->permissionStateDataLock_); auto iter = requestedPermData_.find(tokenID); if (iter == requestedPermData_.end()) { ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid %{public}u.", tokenID);