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

Merge "Allow non-leaf task to be moved to top" into rvc-dev am: 9af9215db2

Browse Source 
Change-Id: Id110abc8d2c56b459652ff1caed90bf22b54bfec
This commit is contained in:
Louis Chang
2020-04-28 08:25:47 +00:00
committed by Automerger Merge Worker
parent 0a8a0b1bac 9af9215db2
commit 69b66d9b50
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/Task.java
View File

@@ -3112,7 +3112,8 @@ class Task extends WindowContainer<WindowContainer> {
@Override @Override
boolean showToCurrentUser() { boolean showToCurrentUser() {
return mForceShowForAllUsers || showForAllUsers() || mWmService.isCurrentProfile(mUserId); return mForceShowForAllUsers || showForAllUsers()
|| mWmService.isCurrentProfile(getTopMostTask().mUserId);
} }
void setForceShowForAllUsers(boolean forceShowForAllUsers) { void setForceShowForAllUsers(boolean forceShowForAllUsers) {

7
services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
View File

@@ -72,6 +72,13 @@ public class TaskStackTests extends WindowTestsBase {
stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */); stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */);
assertEquals(stack.mChildren.get(0), task2); assertEquals(stack.mChildren.get(0), task2);
assertEquals(stack.mChildren.get(1), task1); assertEquals(stack.mChildren.get(1), task1);
// Non-leaf task should be moved to top regardless of the user id.
createTaskInStack((ActivityStack) task2, 0 /* userId */);
createTaskInStack((ActivityStack) task2, 1 /* userId */);
stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */);
assertEquals(stack.mChildren.get(0), task1);
assertEquals(stack.mChildren.get(1), task2);
} }
@Test @Test