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

Commit ebba1751 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Ignore empty tasks when unfreezing recents list after timeout" into udc-dev

parents 4fdb884b e91a468a

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

+2 −1
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ class RecentTasks { 
        synchronized (mService.mGlobalLock) {

            final Task focusedStack = mService.getTopDisplayFocusedRootTask();

            final Task topTask = focusedStack != null ? focusedStack.getTopMostTask() : null;

            resetFreezeTaskListReordering(topTask);

            final Task reorderToEndTask = topTask != null && topTask.hasChild() ? topTask : null;

            resetFreezeTaskListReordering(reorderToEndTask);

        }

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -924,6 +924,11 @@ public class RecentTasksTest extends WindowTestsBase { 


    @Test

    public void testFreezeTaskListOrder_timeout() {

        for (Task t : mTasks) {

            // Make all the tasks non-empty

            new ActivityBuilder(mAtm).setTask(t).build();

        }



        // Add some tasks

        mRecentTasks.add(mTasks.get(0));

        mRecentTasks.add(mTasks.get(1));