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

Commit 48fe5f14 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I48d8b68d848ebf6e7c2c357178c240769704099d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99026473 ebba1751

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));