commit 0db64ac043984cef6d55e6e12d2e8dfc0d452ae8
author Wale Ogunwale <ogunwale@google.com> Sat Apr 11 10:00:42 2020 -0700
committer Wale Ogunwale <ogunwale@google.com> Fri Apr 17 15:05:34 2020 -0700
tree 06793695e90270167d37914c560f4ec3901bd58a
parent 4220cf74ca39cb805ef98984d217171e188802ab

Fixed Task#getVisibility to take into account task hierarchy

Also, correct some uses of getRootHomeTask()

Fixes: 153086746
Bug: 154331729
Bug: 80414790
Test: atest WmTests:ActivityStackTests#testGetVisibility_MultiLevel
Change-Id: I8b9a38879a0b4e6c72686312b414319b8b086cd1

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

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index d92f43b..0b78a12 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4065,7 +4065,7 @@
         return r != null
                 && r.getRootTask() != null
                 && r.inPinnedWindowingMode()
-                && r.getRootTask().isInStackLocked(r) != null;
+                && r.getRootTask().isInTask(r) != null;
     }
 
     @Override