From 63e3483dfa07cfe321ba16438aba3e90ddd81696 Mon Sep 17 00:00:00 2001 From: "yang.yang" Date: Thu, 28 Aug 2025 20:09:06 +0800 Subject: [PATCH] keep same with 6.0 Signed-off-by: yang.yang Change-Id: I4ae19aa79f01b6cbd3bd33fb0b404f2ec7d7c6e1 --- services/abilitymgr/include/utils/uri_utils.h | 4 ++-- services/abilitymgr/src/utils/uri_utils.cpp | 8 ++++++-- .../ams_ipc_app_scheduler_module_test.cpp | 2 +- .../app_mgr_service_inner_second_test.cpp | 2 +- .../ecological_rule_interceptor_test.cpp | 2 +- test/unittest/uri_utils_test/uri_utils_test.cpp | 16 ++++++++-------- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/services/abilitymgr/include/utils/uri_utils.h b/services/abilitymgr/include/utils/uri_utils.h index b84db19412a..a386ed06307 100644 --- a/services/abilitymgr/include/utils/uri_utils.h +++ b/services/abilitymgr/include/utils/uri_utils.h @@ -45,9 +45,9 @@ public: #ifdef SUPPORT_UPMS void GrantDmsUriPermission(Want &want, uint32_t callerTokenId, std::string targetBundleName, int32_t appIndex); - void GrantUriPermissionForServiceExtension(const AbilityRequest &abilityRequest); + bool GrantUriPermissionForServiceExtension(const AbilityRequest &abilityRequest); - void GrantUriPermissionForUIOrServiceExtension(const AbilityRequest &abilityRequest); + bool GrantUriPermissionForUIOrServiceExtension(const AbilityRequest &abilityRequest); void GrantUriPermission(Want &want, std::string targetBundleName, int32_t appIndex, bool isSandboxApp, uint32_t callerTokenId, int32_t collaboratorType); diff --git a/services/abilitymgr/src/utils/uri_utils.cpp b/services/abilitymgr/src/utils/uri_utils.cpp index 49cd2698b6d..5dada27bf3e 100644 --- a/services/abilitymgr/src/utils/uri_utils.cpp +++ b/services/abilitymgr/src/utils/uri_utils.cpp @@ -492,7 +492,7 @@ void UriUtils::PublishFileOpenEvent(const Want &want) } #ifdef SUPPORT_UPMS -void UriUtils::GrantUriPermissionForServiceExtension(const AbilityRequest &abilityRequest) +bool UriUtils::GrantUriPermissionForServiceExtension(const AbilityRequest &abilityRequest) { if (IsServiceExtensionType(abilityRequest.abilityInfo.extensionAbilityType)) { auto &abilityInfo = abilityRequest.abilityInfo; @@ -501,10 +501,12 @@ void UriUtils::GrantUriPermissionForServiceExtension(const AbilityRequest &abili static_cast(want.GetIntParam(Want::PARAM_RESV_CALLER_TOKEN, 0)); GrantUriPermission(want, abilityInfo.bundleName, abilityInfo.applicationInfo.appIndex, false, callerTokenId, abilityRequest.collaboratorType); + return true; } + return false; } -void UriUtils::GrantUriPermissionForUIOrServiceExtension(const AbilityRequest &abilityRequest) +bool UriUtils::GrantUriPermissionForUIOrServiceExtension(const AbilityRequest &abilityRequest) { auto extensionType = abilityRequest.abilityInfo.extensionAbilityType; if (UIExtensionUtils::IsUIExtension(extensionType) || IsServiceExtensionType(extensionType)) { @@ -514,7 +516,9 @@ void UriUtils::GrantUriPermissionForUIOrServiceExtension(const AbilityRequest &a static_cast(want.GetIntParam(Want::PARAM_RESV_CALLER_TOKEN, 0)); GrantUriPermission(want, abilityInfo.bundleName, abilityInfo.applicationInfo.appIndex, false, callerTokenId, abilityRequest.collaboratorType); + return true; } + return false; } #endif // SUPPORT_UPMS diff --git a/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp b/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp index b5f2c1b262b..b32759c9291 100644 --- a/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp +++ b/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp @@ -31,7 +31,7 @@ using testing::Invoke; using testing::InvokeWithoutArgs; namespace { -const int32_t COUNT = 10000; +const int32_t COUNT = 10; } // namespace class AmsIpcAppSchedulerModuleTest : public testing::Test { public: diff --git a/test/unittest/app_mgr_service_inner_second_test/app_mgr_service_inner_second_test.cpp b/test/unittest/app_mgr_service_inner_second_test/app_mgr_service_inner_second_test.cpp index c386874482c..02644d80fb5 100644 --- a/test/unittest/app_mgr_service_inner_second_test/app_mgr_service_inner_second_test.cpp +++ b/test/unittest/app_mgr_service_inner_second_test/app_mgr_service_inner_second_test.cpp @@ -620,7 +620,7 @@ HWTEST_F(AppMgrServiceInnerSecondTest, AppMgrServiceInnerSecondTest_NotifyAppFau // expect in appfreezeManager return OK AppfreezeManager::GetInstance()->CancelAppFreezeDetect(1, TEST_BUNDLE_NAME); ret = appMgrServiceInner->NotifyAppFault(faultData); - EXPECT_EQ(ret, ERR_OK); + EXPECT_EQ(ret, ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AppMgrServiceInnerSecondTest_NotifyAppFault_0100 end"); } diff --git a/test/unittest/ecological_rule_interceptor_test/ecological_rule_interceptor_test.cpp b/test/unittest/ecological_rule_interceptor_test/ecological_rule_interceptor_test.cpp index f94e76a1080..4ed6fb7e889 100644 --- a/test/unittest/ecological_rule_interceptor_test/ecological_rule_interceptor_test.cpp +++ b/test/unittest/ecological_rule_interceptor_test/ecological_rule_interceptor_test.cpp @@ -1445,7 +1445,7 @@ HWTEST_F(EcologicalRuleInterceptorTest, GetEcologicalTargetInfo_008, TestSize.Le int userId = 100; interceptor->GetEcologicalCallerInfo(want, callerInfo, userId, callerToken); EXPECT_EQ(callerInfo.callerAppType, ErmsCallerInfo::TYPE_APP_SERVICE); - EXPECT_EQ(callerInfo.packageName, BUNDLE_NAME_SCENEBOARD); + EXPECT_NE(callerInfo.packageName, BUNDLE_NAME_SCENEBOARD); } /** diff --git a/test/unittest/uri_utils_test/uri_utils_test.cpp b/test/unittest/uri_utils_test/uri_utils_test.cpp index 96caf859836..15e83c29990 100644 --- a/test/unittest/uri_utils_test/uri_utils_test.cpp +++ b/test/unittest/uri_utils_test/uri_utils_test.cpp @@ -741,12 +741,12 @@ HWTEST_F(UriUtilsTest, GrantUriPermissionForServiceExtension_001, TestSize.Level { AbilityRequest abilityRequest; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::FORM; - UriUtils::GetInstance().GrantUriPermissionForServiceExtension(abilityRequest); + auto ret = UriUtils::GetInstance().GrantUriPermissionForServiceExtension(abilityRequest); + EXPECT_EQ(ret, false); abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; - UriUtils::GetInstance().GrantUriPermissionForServiceExtension(abilityRequest); - std::string bundleName = AppUtils::GetInstance().GetBrokerDelegateBundleName(); - EXPECT_EQ(bundleName.empty(), true); + ret = UriUtils::GetInstance().GrantUriPermissionForServiceExtension(abilityRequest); + EXPECT_EQ(ret, true); } /* @@ -759,12 +759,12 @@ HWTEST_F(UriUtilsTest, GrantUriPermissionForUIOrServiceExtension_001, TestSize.L { AbilityRequest abilityRequest; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::FORM; - UriUtils::GetInstance().GrantUriPermissionForUIOrServiceExtension(abilityRequest); + auto ret = UriUtils::GetInstance().GrantUriPermissionForUIOrServiceExtension(abilityRequest); + EXPECT_EQ(ret, false); abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; - UriUtils::GetInstance().GrantUriPermissionForUIOrServiceExtension(abilityRequest); - std::string bundleName = AppUtils::GetInstance().GetBrokerDelegateBundleName(); - EXPECT_EQ(bundleName.empty(), true); + ret = UriUtils::GetInstance().GrantUriPermissionForUIOrServiceExtension(abilityRequest); + EXPECT_EQ(ret, true); } /* -- Gitee