From 10cc0bb5e9a1185e9838caafdff982bcdd11558d Mon Sep 17 00:00:00 2001 From: zhoujun62 Date: Wed, 4 May 2022 10:03:25 +0800 Subject: [PATCH] IssueNo:#I55144:switch to a already existed user, OOBE will be launched Description:switch to a already existed user, OOBE will be launched Sig:SIG_ApplicationFramework Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: zhoujun62 Change-Id: I5caca2edfb57b704e8103c90742f5e13682df1e2 --- services/abilitymgr/src/ability_manager_service.cpp | 1 - services/abilitymgr/src/mission_list_manager.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index a9b1719e36..8198b1d80d 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -3544,7 +3544,6 @@ void AbilityManagerService::StartUserApps(int32_t userId, bool isBoot) if (currentMissionListManager_ && currentMissionListManager_->IsStarted()) { HILOG_INFO("missionListManager ResumeManager"); currentMissionListManager_->ResumeManager(); - return; } StartSystemAbilityByUser(userId, isBoot); } diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index ef5634d8bf..cfc500b1f2 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -1850,6 +1850,12 @@ void MissionListManager::BackToLauncher() HILOG_WARN("no root launcher ability, no need back to launcher."); return; } + + if (launcherRootAbility->GetAbilityInfo().bundleName != AbilityConfig::LAUNCHER_BUNDLE_NAME) { + HILOG_WARN("not launcher mission, no need back to launcher."); + return; + } + auto launcherRootMission = launcherRootAbility->GetMission(); if (!launcherRootMission) { HILOG_WARN("no root launcher mission, no need back to launcher.");