diff options
3 files changed, 10 insertions, 5 deletions
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 8e887d12ee24..677fd5200849 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java @@ -265,7 +265,8 @@ public class ActivityTestsBase { private ComponentName mComponent; private String mPackage; private int mFlags = 0; - private int mTaskId = 0; + // Task id 0 is reserved in ARC for the home app. + private int mTaskId = 1; private int mUserId = 0; private IVoiceInteractionSession mVoiceSession; private boolean mCreateStack = true; diff --git a/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java index 9e6055d55e0f..8d54bc236a66 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java @@ -44,7 +44,11 @@ public class TaskPersisterTest extends AndroidTestCase { super.setUp(); mUserManager = UserManager.get(getContext()); mTaskPersister = new TaskPersister(getContext().getFilesDir()); - testUserId = createUser(TEST_USER_NAME, 0); + // In ARC, the maximum number of supported users is one, which is different from the ones of + // most phones (more than 4). This prevents TaskPersisterTest from creating another user for + // test. However, since guest users can be added as much as possible, we create guest user + // in the test. + testUserId = createUser(TEST_USER_NAME, UserInfo.FLAG_GUEST); } @Override diff --git a/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java b/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java index 72851d01c0ca..b8680bf5f381 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java @@ -156,9 +156,9 @@ public class TaskRecordTests extends ActivityTestsBase { private TaskRecord createTaskRecord(int taskId) { return new TaskRecord(mService.mActivityTaskManager, taskId, new Intent(), null, null, null, - null, null, false, - false, false, 0, 10050, null, new ArrayList<>(), 0, false, null, 0, 0, 0, 0, 0, - null, 0, false, false, false, 0, 0); + ActivityBuilder.getDefaultComponent(), null, false, false, false, 0, 10050, null, + new ArrayList<>(), 0, false, null, 0, 0, 0, 0, 0, null, 0, false, false, false, 0, 0 + ); } private static class TestTaskRecordFactory extends TaskRecordFactory { |