diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 7d8814e5b9d379f5dfbfac41addf9937ba1a51c2..323fa057f53da2122e757b673a072792452f18b9 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 554331d63701cd418c9fececef7bf84a4ef3042f..71b668ed5dc6a657d4d3745aedb31b4f65661f31 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 2d5a680089c754b5f6ad00c198d806afdd6c53f8..a332bc17570e7d062379a0ea853692c9803837a8 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());