openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2025-01-08 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source 
Signed-off-by: xuchenghua09 <xuchenghua09@huawei.com>
This commit is contained in:
xuchenghua09 2022-06-28 15:00:32 +08:00
parent 6d628c9f04
commit 307412157e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/abilitymgr/src/ability_manager_service.cpp
View File

@ -348,7 +348,6 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr<IRemot
{ {
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
if (VerifyAccountPermission(userId) == CHECK_PERMISSION_FAILED) { if (VerifyAccountPermission(userId) == CHECK_PERMISSION_FAILED) {
HILOG_ERROR("%{public}s: Permission verification failed.", __func__); HILOG_ERROR("%{public}s: Permission verification failed.", __func__);
return CHECK_PERMISSION_FAILED; return CHECK_PERMISSION_FAILED;
@ -2953,7 +2952,8 @@ int AbilityManagerService::GenerateAbilityRequestByAction(int32_t userId,
IN_PROCESS_CALL_WITHOUT_RET(bms->ImplicitQueryInfos( IN_PROCESS_CALL_WITHOUT_RET(bms->ImplicitQueryInfos(
request.want, abilityInfoFlag, userId, abilityInfos, extensionInfos)); request.want, abilityInfoFlag, userId, abilityInfos, extensionInfos));
HILOG_INFO("ImplicitQueryInfos, abilityInfo size : %{public}d, extensionInfos size: %{public}d", abilityInfos.size(), extensionInfos.size()); HILOG_INFO("ImplicitQueryInfos, abilityInfo size : %{public}d, extensionInfos size: %{public}d",
abilityInfos.size(), extensionInfos.size());
auto isExtension = (request.callType == AbilityCallType::START_EXTENSION_TYPE || auto isExtension = (request.callType == AbilityCallType::START_EXTENSION_TYPE ||
request.callType == AbilityCallType::CONNECT_ABILITY_TYPE); request.callType == AbilityCallType::CONNECT_ABILITY_TYPE);

2
services/abilitymgr/src/system_dialog_scheduler.cpp
View File

@ -273,7 +273,7 @@ void SystemDialogScheduler::DialogPositionAdaptive(DialogPosition &position, int
} }
} else { } else {
position.height = (lineNums > LINE_NUMS_EIGHT) ? UI_SELECTOR_DIALOG_PHONE_H3 : position.height = (lineNums > LINE_NUMS_EIGHT) ? UI_SELECTOR_DIALOG_PHONE_H3 :
(lineNums > LINE_NUMS_THREE ? UI_SELECTOR_DIALOG_PHONE_H2 : (lineNums > LINE_NUMS_THREE ? UI_SELECTOR_DIALOG_PHONE_H2 :
(lineNums > LINE_NUMS_ZERO ? UI_SELECTOR_DIALOG_PHONE_H1 : position.height)); (lineNums > LINE_NUMS_ZERO ? UI_SELECTOR_DIALOG_PHONE_H1 : position.height));
} }
} }

4
services/test/mock/include/ui_service_mgr_client_mock.h
View File

@ -70,12 +70,12 @@ public:
params_ = ""; params_ = "";
} }
std::string GetParams() std::string GetParams()
{ {
return params_; return params_;
} }
bool IsCallBack() bool IsCallBack()
{ {
return isCallBack_; return isCallBack_;
} }