openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-25 12:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix review

Browse Source 
Signed-off-by: xinking129 <xinxin13@huawei.com>
This commit is contained in:
xinking129
2023-05-09 22:04:14 +08:00
parent 64d9d2aaa6
commit 15801feb5c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/src/implicit_start_processor.cpp
+5 -5
View File
@@ -151,10 +151,10 @@ int ImplicitStartProcessor::GenerateAbilityRequestByAction(int32_t userId,
auto abilityInfoFlag = AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_DEFAULT;
std::vector<AppExecFwk::AbilityInfo> abilityInfos;
std::vector<AppExecFwk::ExtensionAbilityInfo> 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<std::string> 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 =
test/moduletest/mock/include/mock_bundle_mgr.h
+1 -1
View File
@@ -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<AbilityInfo>& abilityInfos, std::vector<ExtensionAbilityInfo>& extensionInfos) override;
BundleMgrService()
test/moduletest/mock/src/mock_bundle_mgr.cpp
+1 -1
View File
@@ -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<AbilityInfo>& abilityInfos, std::vector<ExtensionAbilityInfo>& extensionInfos)
{
if (want.GetAction() == "ohos.want.action.viewData") {