commit 6e87844a601bbaf0a3de229058036c1576789423
author tanxiaoyan <tanxiaoyan@xiaomi.com> Thu Apr 01 17:33:46 2021 +0800
committer Chilun <chilunhuang@google.com> Thu Apr 01 18:13:27 2021 +0800
tree 19b5a705f954dd959d36de5beafca792e607eaaa
parent c296c468433346fedb4d10c85f65b7c18a00d3b8

Do not reposition leaf tasks for single task stacks

Reposition leaf tasks may cause wrong top focused stack while switch
user.

Bug: 183996163
Test: atest WmTests:TaskTests
Change-Id: Ifee5b2092e73b26bc0b82afe32a9c803d0d88917

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 a4a0866..549be43 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*/);
         }
     }