From ab935c36bdb4b5ed4655271d13c732dcaa2e0185 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Sat, 20 Aug 2022 17:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TOKEN=5FSHELL=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- services/common/src/bundle_active_service.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/services/common/src/bundle_active_service.cpp b/services/common/src/bundle_active_service.cpp index c5ee773..37607d1 100644 --- a/services/common/src/bundle_active_service.cpp +++ b/services/common/src/bundle_active_service.cpp @@ -275,7 +275,8 @@ bool BundleActiveService::IsBundleIdle(const std::string& bundleName, int32_t& e BUNDLE_ACTIVE_LOGI("check other bundle idle state"); auto tokenFlag = AccessToken::AccessTokenKit::GetTokenTypeFlag(tokenId); if (isSystemAppAndHasPermission == true || - tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE) { + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE || + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_SHELL) { errCode = 0; result = bundleActiveCore_->IsBundleIdle(bundleName, userId); } else { @@ -386,7 +387,8 @@ int32_t BundleActiveService::SetBundleGroup(const std::string& bundleName, int32 BUNDLE_ACTIVE_LOGI("SetBundleGroup userid is %{public}d", userId); auto tokenFlag = AccessToken::AccessTokenKit::GetTokenTypeFlag(tokenId); if (CheckBundleIsSystemAppAndHasPermission(callingUid, tokenId, errCode) || - tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE) { + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE || + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_SHELL) { result = bundleActiveCore_->SetBundleGroup(bundleName, newGroup, userId, isFlush); } } @@ -480,7 +482,8 @@ int32_t BundleActiveService::QueryPackageGroup(std::string& bundleName, int32_t AccessToken::AccessTokenID tokenId = OHOS::IPCSkeleton::GetCallingTokenID(); auto tokenFlag = AccessToken::AccessTokenKit::GetTokenTypeFlag(tokenId); if (CheckBundleIsSystemAppAndHasPermission(callingUid, tokenId, errCode) || - tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE) { + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE || + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_SHELL) { result = bundleActiveCore_->QueryPackageGroup(bundleName, userId); } } @@ -633,7 +636,8 @@ int32_t BundleActiveService::QueryEventStats(int64_t beginTime, int64_t endTime, AccessToken::AccessTokenID tokenId = OHOS::IPCSkeleton::GetCallingTokenID(); auto tokenFlag = AccessToken::AccessTokenKit::GetTokenTypeFlag(tokenId); if (CheckBundleIsSystemAppAndHasPermission(callingUid, tokenId, errCode) || - tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE) { + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE || + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_SHELL) { errCode = bundleActiveCore_->QueryEventStats(beginTime, endTime, eventStats, userId); } } @@ -660,7 +664,8 @@ int32_t BundleActiveService::QueryAppNotificationNumber(int64_t beginTime, int64 AccessToken::AccessTokenID tokenId = OHOS::IPCSkeleton::GetCallingTokenID(); auto tokenFlag = AccessToken::AccessTokenKit::GetTokenTypeFlag(tokenId); if (CheckBundleIsSystemAppAndHasPermission(callingUid, tokenId, errCode) || - tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE) { + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_NATIVE || + tokenFlag == AccessToken::TypeATokenTypeEnum::TOKEN_SHELL) { errCode = bundleActiveCore_->QueryAppNotificationNumber(beginTime, endTime, eventStats, userId); } } -- Gitee