diff --git a/services/abilitymgr/src/implicit_start_processor.cpp b/services/abilitymgr/src/implicit_start_processor.cpp index bc457395ba..d37b5aa948 100644 --- a/services/abilitymgr/src/implicit_start_processor.cpp +++ b/services/abilitymgr/src/implicit_start_processor.cpp @@ -151,10 +151,10 @@ int ImplicitStartProcessor::GenerateAbilityRequestByAction(int32_t userId, auto abilityInfoFlag = AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_DEFAULT; std::vector abilityInfos; std::vector extensionInfos; - bool isReturnDefaultSetting = false; - request.want.GetBoolParam(SHOW_DEFAULT_PICKER_FLAG, isReturnDefaultSetting); + bool withDefault = false; + request.want.GetBoolParam(SHOW_DEFAULT_PICKER_FLAG, withDefault); IN_PROCESS_CALL_WITHOUT_RET(bms->ImplicitQueryInfos( - request.want, abilityInfoFlag, userId, isReturnDefaultSetting, abilityInfos, extensionInfos)); + request.want, abilityInfoFlag, userId, withDefault, abilityInfos, extensionInfos)); HILOG_INFO("ImplicitQueryInfos, abilityInfo size : %{public}zu, extensionInfos size: %{public}zu", abilityInfos.size(), extensionInfos.size()); @@ -177,7 +177,7 @@ int ImplicitStartProcessor::GenerateAbilityRequestByAction(int32_t userId, std::vector infoNames; if (deviceType == STR_PC) { IN_PROCESS_CALL_WITHOUT_RET(bms->ImplicitQueryInfos(implicitwant, abilityInfoFlag, userId, - isReturnDefaultSetting, implicitAbilityInfos, implicitExtensionInfos)); + withDefault, implicitAbilityInfos, implicitExtensionInfos)); if (implicitAbilityInfos.size() != 0 && request.want.GetType() != TYPE_ONLY_MATCH_WILDCARD) { for (auto implicitAbilityInfo : implicitAbilityInfos) { infoNames.emplace_back(implicitAbilityInfo.bundleName + "#" + @@ -191,7 +191,7 @@ int ImplicitStartProcessor::GenerateAbilityRequestByAction(int32_t userId, } if (deviceType == STR_PC) { auto isDefaultFlag = false; - if (isReturnDefaultSetting) { + if (withDefault) { auto defaultMgr = GetDefaultAppProxy(); AppExecFwk::BundleInfo bundleInfo; ErrCode ret = diff --git a/test/moduletest/mock/include/mock_bundle_mgr.h b/test/moduletest/mock/include/mock_bundle_mgr.h index 259b317ba3..3b26e90a61 100644 --- a/test/moduletest/mock/include/mock_bundle_mgr.h +++ b/test/moduletest/mock/include/mock_bundle_mgr.h @@ -333,7 +333,7 @@ public: return true; } - bool ImplicitQueryInfos(const Want& want, int32_t flags, int32_t userId, bool isReturnDefaultSetting, + bool ImplicitQueryInfos(const Want& want, int32_t flags, int32_t userId, bool withDefault, std::vector& abilityInfos, std::vector& extensionInfos) override; BundleMgrService() diff --git a/test/moduletest/mock/src/mock_bundle_mgr.cpp b/test/moduletest/mock/src/mock_bundle_mgr.cpp index 64a6095735..3bb178201a 100644 --- a/test/moduletest/mock/src/mock_bundle_mgr.cpp +++ b/test/moduletest/mock/src/mock_bundle_mgr.cpp @@ -171,7 +171,7 @@ bool BundleMgrService::CheckWantEntity(const AAFwk::Want& want, AbilityInfo& abi return false; } -bool BundleMgrService::ImplicitQueryInfos(const Want& want, int32_t flags, int32_t userId, bool isReturnDefaultSetting, +bool BundleMgrService::ImplicitQueryInfos(const Want& want, int32_t flags, int32_t userId, bool withDefault, std::vector& abilityInfos, std::vector& extensionInfos) { if (want.GetAction() == "ohos.want.action.viewData") {