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

Commit 20e1a894 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Update recent tasks order when the last resumed activity changed" into... 

Merge "Update recent tasks order when the last resumed activity changed" into tm-qpr-dev am: d7f0da67 am: aad1a8a0

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



Change-Id: Icfed2b8138655cd98d4858f7a6775e2b0e9c969c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 813ff680 aad1a8a0

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

+1 −0
Original line number Diff line number Diff line
@@ -4756,6 +4756,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mTaskChangeNotificationController.notifyTaskFocusChanged(prevTask.mTaskId, false);

            }

            mTaskChangeNotificationController.notifyTaskFocusChanged(task.mTaskId, true);

            mTaskSupervisor.mRecentTasks.add(task);

        }



        applyUpdateLockStateLocked(r);

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

+13 −0
Original line number Diff line number Diff line
@@ -248,6 +248,19 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { 
                eq(true) /* focused */);

    }



    /**

     * Ensures it updates recent tasks order when the last resumed activity changed.

     */

    @Test

    public void testUpdateRecentTasksForTopResumed() {

        spyOn(mSupervisor.mRecentTasks);

        final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build();

        final Task task = activity.getTask();



        mAtm.setLastResumedActivityUncheckLocked(activity, "test");

        verify(mSupervisor.mRecentTasks).add(eq(task));

    }



    /**

     * Ensures that a trusted display can launch arbitrary activity and an untrusted display can't.

     */