From c36398e91a01eae0516eaac41896da9d0f1faa2b Mon Sep 17 00:00:00 2001 From: Darryl L Johnson Date: Tue, 18 Feb 2020 15:31:12 -0800 Subject: [PATCH] Revert creation of home stack from WindowState#getRootTask(). This causes an issue navigating back home after a restart. The root cause is still being investigated. Verified manually and w/ fix of launcher tests. Bug: 149753418 Test: atest NexusLauncherTests:com.android.quickstep.DigitalWellBeingToastTest Change-Id: Ied638ccea8854c77d88a805ef79200d5bd46e383 --- services/core/java/com/android/server/wm/WindowState.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 78d6b96314eeb..1cfd0d49d4320 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1513,8 +1513,7 @@ class WindowState extends WindowContainer implements WindowManagerP // Some system windows (e.g. "Power off" dialog) don't have a task, but we would still // associate them with some stack to enable dimming. final DisplayContent dc = getDisplayContent(); - return mAttrs.type >= FIRST_SYSTEM_WINDOW && dc != null - ? dc.getOrCreateRootHomeTask() : null; + return mAttrs.type >= FIRST_SYSTEM_WINDOW && dc != null ? dc.getRootHomeTask() : null; } /**