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

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

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

Change-Id: Icfed2b8138655cd98d4858f7a6775e2b0e9c969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2023-01-18 04:35:33 +00:00
committed by Automerger Merge Worker
parent 813ff68042 aad1a8a0e4
commit 20e1a89414
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

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

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

@@ -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.
*/