From b1a3e7ede074fe81f286bbed3ce4a4a0658dddfa Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Thu, 13 Feb 2020 16:45:03 +0800 Subject: Prevent position topmost task to top Home stack was reordered to bottom after user switched. So, we were able to navigate through all tasks by back key. Position topmost task to top doesn't seem necessary, but had unintentionally moved its parent to top. Bug: 148087585 Test: switch user and go back Change-Id: If0230a7ef5a118b442bea72e7a35defe9d4dea75 --- services/core/java/com/android/server/wm/RootWindowContainer.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 2196d899406d..e3d85c84b50c 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2008,10 +2008,6 @@ class RootWindowContainer extends WindowContainer for (int stackNdx = display.getStackCount() - 1; stackNdx >= 0; --stackNdx) { final ActivityStack stack = display.getStackAt(stackNdx); stack.switchUser(userId); - Task task = stack.getTopMostTask(); - if (task != null && task != stack) { - stack.positionChildAtTop(task); - } } } -- cgit v1.2.3-59-g8ed1b