From 4098d85afc3b50ef97894baa5c05163118929bc8 Mon Sep 17 00:00:00 2001 From: yuwenze Date: Wed, 15 Mar 2023 10:04:24 +0000 Subject: [PATCH] opt Signed-off-by: yuwenze Change-Id: I388922f6b06a8d9dc630fecea4909d682ba8d83b --- services/abilitymgr/src/ability_manager_service.cpp | 2 +- services/abilitymgr/src/mission_list_manager.cpp | 2 ++ services/appmgr/src/app_mgr_service_inner.cpp | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 7d8814e5b9d..323fa057f53 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -5588,7 +5588,6 @@ int32_t AbilityManagerService::ShowPickerDialog( newWant.SetAction(""); return IN_PROCESS_CALL(StartAbility(newWant, DEFAULT_INVAL_VALUE, userId)); } -#endif bool AbilityManagerService::CheckWindowMode(int32_t windowMode, const std::vector& windowModes) const @@ -5608,6 +5607,7 @@ bool AbilityManagerService::CheckWindowMode(int32_t windowMode, } return false; } +#endif int AbilityManagerService::CheckCallServicePermission(const AbilityRequest &abilityRequest) { diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index 554331d6370..71b668ed5dc 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -903,7 +903,9 @@ int MissionListManager::AttachAbilityThread(const sptr &sched auto taskName = std::to_string(abilityRecord->GetMissionId()) + "_cold"; handler->RemoveTask(taskName); +#ifdef SUPPORT_GRAPHICS abilityRecord->PostCancelStartingWindowHotTask(); +#endif DelayedSingleton::GetInstance()->MoveToForeground(token); return ERR_OK; diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index 2d5a680089c..a332bc17570 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -77,7 +77,6 @@ constexpr int KILL_PROCESS_DELAYTIME_MICRO_SECONDS = 200; constexpr int REGISTER_FOCUS_DELAY = 5000; const std::string CLASS_NAME = "ohos.app.MainThread"; const std::string FUNC_NAME = "main"; -const std::string SO_PATH = "system/lib64/libmapleappkit.z.so"; const std::string RENDER_PARAM = "invalidparam"; const std::string COLD_START = "coldStart"; const std::string DLP_PARAMS_INDEX = "ohos.dlp.params.index"; @@ -1526,7 +1525,6 @@ void AppMgrServiceInner::StartProcess(const std::string &appName, const std::str } startMsg.procName = processName; - startMsg.soPath = SO_PATH; startMsg.accessTokenIdEx = bundleInfo.applicationInfo.accessTokenIdEx; PerfProfile::GetInstance().SetAppForkStartTime(GetTickCount()); -- Gitee