From 6df03dc91d4602fbf9b4e3043d04d63202ec37b3 Mon Sep 17 00:00:00 2001 From: AXYChen Date: Thu, 14 Nov 2024 14:37:12 +0800 Subject: [PATCH] =?UTF-8?q?PermissionStateFull=E5=85=83=E7=B4=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: AXYChen Change-Id: Iefc3284b6e1be728808d4c0a093eb6d549ad3c46 --- services/bundlemgr/src/bundle_permission_mgr.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/services/bundlemgr/src/bundle_permission_mgr.cpp b/services/bundlemgr/src/bundle_permission_mgr.cpp index 04c6c7ee3b..ef4920fa7d 100644 --- a/services/bundlemgr/src/bundle_permission_mgr.cpp +++ b/services/bundlemgr/src/bundle_permission_mgr.cpp @@ -215,10 +215,9 @@ std::vector BundlePermissionMgr::GetPermission for (const auto &reqPermission : reqPermissions) { AccessToken::PermissionStateFull perState; perState.permissionName = reqPermission.name; - perState.isGeneral = true; - perState.resDeviceID.emplace_back(innerBundleInfo.GetBaseApplicationInfo().deviceId); - perState.grantStatus.emplace_back(AccessToken::PermissionState::PERMISSION_DENIED); - perState.grantFlags.emplace_back(AccessToken::PermissionFlag::PERMISSION_DEFAULT_FLAG); + perState.deviceID = innerBundleInfo.GetBaseApplicationInfo().deviceId; + perState.permGrantStatus = AccessToken::PermissionState::PERMISSION_DENIED; + perState.grantFlag = AccessToken::PermissionFlag::PERMISSION_DEFAULT_FLAG; permStateFullList.emplace_back(perState); } } else { @@ -266,11 +265,9 @@ bool BundlePermissionMgr::GetRequestPermissionStates( }); if (iter != allPermissionState.end()) { LOG_D(BMS_TAG_DEFAULT, "GetRequestPermissionStates request permission name: %{public}s", req.c_str()); - for (std::vector::size_type i = 0; i < iter->resDeviceID.size(); i++) { - if (iter->resDeviceID[i] == deviceId) { - bundleInfo.reqPermissionStates.emplace_back(iter->grantStatus[i]); - break; - } + if (iter->deviceID == deviceId) { + bundleInfo.reqPermissionStates.emplace_back(iter->permGrantStatus); + break; } } else { LOG_E(BMS_TAG_DEFAULT, "request permission name : %{public}s is not exit in AccessTokenMgr", req.c_str()); -- Gitee