openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!13927 给窗口传入单独的DisplayID

Browse Source 
Merge pull request !13927 from 杨旭光/feat/display-id
This commit is contained in:
openharmony_ci
2025-05-17 08:25:16 +00:00
committed by Gitee
parent ec7b68036f d1ce87d5c1
commit eda446c8da
15 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp
+6
View File
@@ -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;
test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn
+1
View File
@@ -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",
test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn
+1
View File
@@ -95,6 +95,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerAFuzzTest") {
if (ability_runtime_graphics) {
external_deps += [
"window_manager:libdm",
"window_manager:libwsutils",
"window_manager:scene_session",
]
test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn
+1
View File
@@ -96,6 +96,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerBFuzzTest") {
if (ability_runtime_graphics) {
external_deps += [
"window_manager:libdm",
"window_manager:libwsutils",
"window_manager:scene_session",
]
test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
+1
View File
@@ -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",
test/unittest/ability_manager_service_eleven_test/BUILD.gn
+2
View File
@@ -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",
]
}
test/unittest/ability_manager_service_sixth_test/BUILD.gn
+1
View File
@@ -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",
test/unittest/ability_manager_service_third_test/BUILD.gn
+1
View File
@@ -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",
test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/app_exit_reason_helper_second_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/app_exit_reason_helper_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/app_exit_reason_helper_third_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/status_bar_delegate_manager_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn
+1
View File
@@ -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",
]
test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn
+1
View File
@@ -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",
]