Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not reposition leaf tasks from grandparent tasks" into rvc-qpr-dev am: b842240bae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12208321

Change-Id: Iae5021aa8041386c88218e0f155a13ba2ba7b2d4
This commit is contained in:
TreeHugger Robot
2020-07-23 03:27:38 +00:00
committed by Automerger Merge Worker
parent 05c29c86ed b842240bae
commit 00e4d91d10
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -928,12 +928,9 @@ class ActivityStack extends Task {
mCurrentUser = userId; mCurrentUser = userId;
super.switchUser(userId); super.switchUser(userId);
forAllLeafTasks((t) -> { if (isLeafTask() && showToCurrentUser()) {
if (t.showToCurrentUser() && t != this) { getParent().positionChildAt(POSITION_TOP, this, false /*includeParents*/);
mChildren.remove(t); }
mChildren.add(t);
}
}, true /* traverseTopToBottom */);
} }
void minimalResumeActivityLocked(ActivityRecord r) { void minimalResumeActivityLocked(ActivityRecord r) {

2
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -335,7 +335,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
} }
} }
} else { } else {
throw new RuntimeException("Reparenting leaf Tasks is not supported now."); throw new RuntimeException("Reparenting leaf Tasks is not supported now. " + task);
} }
} else { } else {
// Ugh, of course ActivityStack has its own special reorder logic... // Ugh, of course ActivityStack has its own special reorder logic...

15
services/tests/wmtests/src/com/android/server/wm/TaskTests.java
View File

@@ -186,4 +186,19 @@ public class TaskTests extends WindowTestsBase {
assertTrue(r.finishing); assertTrue(r.finishing);
}); });
} }
@Test
public void testSwitchUser() {
final Task rootTask = createTaskStackOnDisplay(mDisplayContent);
final Task childTask = createTaskInStack((ActivityStack) rootTask, 0 /* userId */);
final Task leafTask1 = createTaskInStack((ActivityStack) childTask, 10 /* userId */);
final Task leafTask2 = createTaskInStack((ActivityStack) childTask, 0 /* userId */);
assertEquals(1, rootTask.getChildCount());
assertEquals(leafTask2, childTask.getTopChild());
doReturn(true).when(leafTask1).showToCurrentUser();
rootTask.switchUser(10);
assertEquals(1, rootTask.getChildCount());
assertEquals(leafTask1, childTask.getTopChild());
}
} }