Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2be8e23 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

Merge "Allow non-leaf task to be moved to top" into rvc-dev am: 9af9215d am: 69b66d9b am: 66adae02 am: 0480d395

Change-Id: I55a09d0cb64bf967af03ad39a6f8f3c67f9826f9
parents b57b45b6 0480d395

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

+2 −1
Original line number Diff line number Diff line
@@ -3112,7 +3112,8 @@ class Task extends WindowContainer<WindowContainer> { 


    @Override

    boolean showToCurrentUser() {

        return mForceShowForAllUsers || showForAllUsers() || mWmService.isCurrentProfile(mUserId);

        return mForceShowForAllUsers || showForAllUsers()

                || mWmService.isCurrentProfile(getTopMostTask().mUserId);

    }



    void setForceShowForAllUsers(boolean forceShowForAllUsers) {

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

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ public class TaskStackTests extends WindowTestsBase { 
        stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */);

        assertEquals(stack.mChildren.get(0), task2);

        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