diff options
| author | 2024-08-15 08:17:48 +0000 | |
|---|---|---|
| committer | 2024-08-15 08:18:20 +0000 | |
| commit | 7926f3d8468b92ea31a25dee1f2bc596c8b318ea (patch) | |
| tree | e40a7ba3a5890eef8fd112b734f196d994af627f | |
| parent | 2962f79dfd202e88ee5b6be93b4ac8612d39b9db (diff) | |
Fix CtsVirtualDevicesAppLaunchTestCases#RecentTasksTest
Removes the test activity when the virtual display is removed
if the DisplayInfo#removeMode is REMOVE_MODE_DESTROY_CONTENT
and the display-window-settings is undefined.
Bug: 359902777
Test: atest RecentTasksTest
Flag: EXEMPT bugfix
Change-Id: I2aaf2684777f8f950a157922104a5ae2024d58b0
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayWindowSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayWindowSettings.java b/services/core/java/com/android/server/wm/DisplayWindowSettings.java index 2f0ee171b5ba..f40f26179f85 100644 --- a/services/core/java/com/android/server/wm/DisplayWindowSettings.java +++ b/services/core/java/com/android/server/wm/DisplayWindowSettings.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.view.Display.REMOVE_MODE_DESTROY_CONTENT; import static android.view.WindowManager.DISPLAY_IME_POLICY_FALLBACK_DISPLAY; import static android.view.WindowManager.DISPLAY_IME_POLICY_LOCAL; import static android.view.WindowManager.REMOVE_CONTENT_MODE_DESTROY; @@ -183,7 +184,7 @@ class DisplayWindowSettings { final DisplayInfo displayInfo = dc.getDisplayInfo(); final SettingsProvider.SettingsEntry settings = mSettingsProvider.getSettings(displayInfo); if (settings.mRemoveContentMode == REMOVE_CONTENT_MODE_UNDEFINED) { - if (dc.isPrivate()) { + if (dc.isPrivate() || dc.getDisplay().getRemoveMode() == REMOVE_MODE_DESTROY_CONTENT) { // For private displays by default content is destroyed on removal. return REMOVE_CONTENT_MODE_DESTROY; } |