commit 75088d14f428f7ae8fc3bb0a44265be4309cde12
author Darryl Johnson <darryljohnson@google.com> Wed Feb 19 01:21:56 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 01:21:56 2020 +0000
tree 84589788e68fb4142518dbbc355f2865944736ff
parent 4c3249b2fd00f68fccbffb5633e36304f6e52dfe
parent c36398e91a01eae0516eaac41896da9d0f1faa2b

Merge "Revert creation of home stack from WindowState#getRootTask()."

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 78d6b9631..1cfd0d4 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 @@
         // 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;
     }
 
     /**