Moved mRecentTasks to ActivityManagerTaskService (4/n)
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I7e48eaf66200f689757578461076e9288b862b33
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
index 0154d36..fca3717 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
@@ -108,13 +108,12 @@
return service;
}
- protected ActivityManagerService setupActivityManagerService(ActivityManagerService service) {
+ protected ActivityManagerService setupActivityManagerService(
+ ActivityManagerService service, ActivityTaskManagerService atm) {
service = spy(service);
+ atm = spy(atm);
// Makes sure the supervisor is using with the spy object.
service.mStackSupervisor.setService(service);
- // Makes sure activity task is created with the spy object.
- TestActivityTaskManagerService atm =
- spy(new TestActivityTaskManagerService(service.mContext));
service.setActivityTaskManager(atm);
doReturn(mock(IPackageManager.class)).when(service).getPackageManager();
doNothing().when(service).grantEphemeralAccessLocked(anyInt(), any(), anyInt(), anyInt());
@@ -122,6 +121,11 @@
return service;
}
+ protected ActivityManagerService setupActivityManagerService(ActivityManagerService service) {
+ return setupActivityManagerService(
+ service, new TestActivityTaskManagerService(service.mContext));
+ }
+
/**
* Builder for creating new activities.
*/
diff --git a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
index af6686f..f98c50a 100644
--- a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
@@ -145,8 +145,9 @@
super.setUp();
mTaskPersister = new TestTaskPersister(mContext.getFilesDir());
- mService = setupActivityManagerService(new MyTestActivityManagerService(mContext));
- mRecentTasks = (TestRecentTasks) mService.getRecentTasks();
+ mService = setupActivityManagerService(new MyTestActivityManagerService(mContext),
+ new MyTestActivityTaskManagerService(mContext));
+ mRecentTasks = (TestRecentTasks) mService.mActivityTaskManager.getRecentTasks();
mRecentTasks.loadParametersFromResources(mContext.getResources());
mHomeStack = mService.mStackSupervisor.getDefaultDisplay().createStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */);
@@ -827,6 +828,17 @@
}
}
+ private class MyTestActivityTaskManagerService extends TestActivityTaskManagerService {
+ MyTestActivityTaskManagerService(Context context) {
+ super(context);
+ }
+
+ @Override
+ protected RecentTasks createRecentTasks() {
+ return new TestRecentTasks(this, mTaskPersister, new TestUserController(mAm));
+ }
+ }
+
private class MyTestActivityManagerService extends TestActivityManagerService {
MyTestActivityManagerService(Context context) {
super(context);
@@ -838,11 +850,6 @@
}
@Override
- protected RecentTasks createRecentTasks() {
- return new TestRecentTasks(this, mTaskPersister, new TestUserController(this));
- }
-
- @Override
public boolean isUserRunning(int userId, int flags) {
return true;
}
@@ -952,7 +959,7 @@
boolean lastAllowed;
- TestRecentTasks(ActivityManagerService service, TaskPersister taskPersister,
+ TestRecentTasks(ActivityTaskManagerService service, TaskPersister taskPersister,
UserController userController) {
super(service, taskPersister, userController);
}
diff --git a/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java b/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java
index eefd973..91a02e4 100644
--- a/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java
@@ -63,7 +63,8 @@
super.setUp();
mRecentsComponent = new ComponentName(mContext.getPackageName(), "RecentsActivity");
- mService = setupActivityManagerService(new MyTestActivityManagerService(mContext));
+ mService = setupActivityManagerService(new TestActivityManagerService(mContext),
+ new MyTestActivityTaskManagerService(mContext));
AttributeCache.init(mContext);
}
@@ -99,8 +100,8 @@
eq(REORDER_KEEP_IN_PLACE), any());
}
- private class MyTestActivityManagerService extends TestActivityManagerService {
- MyTestActivityManagerService(Context context) {
+ private class MyTestActivityTaskManagerService extends TestActivityTaskManagerService {
+ MyTestActivityTaskManagerService(Context context) {
super(context);
}