diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index a55dbc75eb..eb4e4466ae 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -22,6 +22,7 @@ #include "app_exit_reason_data_manager.h" #include "app_mgr_util.h" #include "app_utils.h" +#include "display_util.h" #include "ffrt.h" #include "global_constant.h" #include "hitrace_meter.h" @@ -2939,6 +2940,11 @@ int UIAbilityLifecycleManager::MoveMissionToFront(int32_t sessionId, std::shared TAG_LOGI(AAFwkTag::ABILITYMGR, "MoveMissionToFront, setting displayId=%{public}d", startOptions->GetDisplayID()); (sessionInfo->want).SetParam(Want::PARAM_RESV_DISPLAY_ID, startOptions->GetDisplayID()); + if (startOptions->GetDisplayID() == 0) { + (sessionInfo->want).SetParam(Want::PARAM_RESV_DISPLAY_ID, DisplayUtil::GetDefaultDisplayId()); + } + } else { + (sessionInfo->want).SetParam(Want::PARAM_RESV_DISPLAY_ID, -1); } sessionInfo->processOptions = nullptr; sessionInfo->startWindowOption = nullptr; diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 7bb342b7a4..2d8b71bfe1 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -102,6 +102,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", "window_manager:libmodal_system_ui_extension_client", "window_manager:libwsutils", "window_manager:scene_session", diff --git a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn index 875db76276..2b186d7e57 100644 --- a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn @@ -95,6 +95,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerAFuzzTest") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", ] diff --git a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn index 516185c3a3..28ea5577cf 100644 --- a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn @@ -96,6 +96,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerBFuzzTest") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", ] diff --git a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn index 3c8e1cb5c6..eaf02d3fcf 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -82,6 +82,7 @@ ohos_moduletest("specified_ability_service_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libmodal_system_ui_extension_client", "window_manager:libwsutils", "window_manager:scene_session", diff --git a/test/unittest/ability_manager_service_eleven_test/BUILD.gn b/test/unittest/ability_manager_service_eleven_test/BUILD.gn index 6b62b534fd..6337c42c35 100644 --- a/test/unittest/ability_manager_service_eleven_test/BUILD.gn +++ b/test/unittest/ability_manager_service_eleven_test/BUILD.gn @@ -108,6 +108,8 @@ ohos_unittest("ability_manager_service_eleven_test") { if (ability_runtime_graphics) { external_deps += [ "hitrace:libhitracechain", + "window_manager:libdm", + "window_manager:libwsutils", "window_manager:scene_session", ] } diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 73319c34e7..5985952b21 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -108,6 +108,7 @@ ohos_unittest("ability_manager_service_sixth_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", "window_manager:session_manager_lite", diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index ca1124e88c..02ccc39f94 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -119,6 +119,7 @@ ohos_unittest("ability_manager_service_third_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", "window_manager:session_manager_lite", diff --git a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn index 8d0768b0f2..0893709a1e 100644 --- a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn @@ -85,6 +85,7 @@ ohos_unittest("app_exit_reason_helper_fourth_test") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", "window_manager:libwsutils", "window_manager:session_manager_lite", ] diff --git a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn index 0e20233e80..fde875216b 100644 --- a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn @@ -76,6 +76,7 @@ ohos_unittest("app_exit_reason_helper_second_test") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", "window_manager:libwsutils", "window_manager:session_manager_lite", ] diff --git a/test/unittest/app_exit_reason_helper_test/BUILD.gn b/test/unittest/app_exit_reason_helper_test/BUILD.gn index 90a04e11f9..12890423f5 100644 --- a/test/unittest/app_exit_reason_helper_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_test/BUILD.gn @@ -69,6 +69,7 @@ ohos_unittest("app_exit_reason_helper_test") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", "window_manager:libwsutils", "window_manager:session_manager_lite", ] diff --git a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn index 48b18e4a08..e62b72bba2 100644 --- a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn @@ -86,6 +86,7 @@ ohos_unittest("app_exit_reason_helper_third_test") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", "window_manager:libwsutils", "window_manager:session_manager_lite", ] diff --git a/test/unittest/status_bar_delegate_manager_test/BUILD.gn b/test/unittest/status_bar_delegate_manager_test/BUILD.gn index 407d8ef99f..53bcb6ce08 100644 --- a/test/unittest/status_bar_delegate_manager_test/BUILD.gn +++ b/test/unittest/status_bar_delegate_manager_test/BUILD.gn @@ -95,6 +95,7 @@ ohos_unittest("status_bar_delegate_manager_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", ] diff --git a/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn index 7cc5d03c12..ad6b0a0c3d 100644 --- a/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn @@ -106,6 +106,7 @@ ohos_unittest("ui_ability_lifecycle_manager_second_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", ] diff --git a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn index 0476aa8414..71428d24e0 100644 --- a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn @@ -100,6 +100,7 @@ ohos_unittest("ui_ability_lifecycle_manager_test") { if (ability_runtime_graphics) { external_deps += [ + "window_manager:libdm", "window_manager:libwsutils", "window_manager:scene_session", ]