commit cf150a40eacac902ad5f1fae3bcdc69e94ca0f23
author Chilun Huang <chilunhuang@google.com> Mon Apr 12 02:02:56 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 02:02:56 2021 +0000
tree afa867807296265e309ed23bd2419aeb656725a1
parent a4bc08a8e85b9350145b91922c478d11d0ea4214
parent 6e87844a601bbaf0a3de229058036c1576789423

Merge "Do not reposition leaf tasks for single task stacks" into sc-dev

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index c293a15..4b4d7f0 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5534,7 +5534,7 @@
         mCurrentUser = userId;
 
         super.switchUser(userId);
-        if (isLeafTask() && showToCurrentUser()) {
+        if (!isRootTask() && showToCurrentUser()) {
             getParent().positionChildAt(POSITION_TOP, this, false /*includeParents*/);
         }
     }