Revert too strcit assertion in ActivityManagerTest
This CL reverts too strict assertion introduced by I95c3cc2c56.
Change-Id: I73b24cec23e0aa981d23d80f41cb532699a5b30a
Fix: 117924387
Test: atest FrameworksServicesTests:ActivityManagerTest
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
index 63e99c8..2dfb375 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
@@ -62,14 +62,14 @@
private void testTaskIdsForUser(int userId) throws RemoteException {
List<?> recentTasks = service.getRecentTasks(100, 0, userId).getList();
- assertThat(recentTasks).isNotNull();
- assertThat(recentTasks).isNotEmpty();
- for (Object elem : recentTasks) {
- assertThat(elem).isInstanceOf(RecentTaskInfo.class);
- RecentTaskInfo recentTask = (RecentTaskInfo) elem;
- int taskId = recentTask.taskId;
- assertEquals("The task id " + taskId + " should not belong to user " + userId,
- taskId / UserHandle.PER_USER_RANGE, userId);
+ if (recentTasks != null) {
+ for (Object elem : recentTasks) {
+ assertThat(elem).isInstanceOf(RecentTaskInfo.class);
+ RecentTaskInfo recentTask = (RecentTaskInfo) elem;
+ int taskId = recentTask.taskId;
+ assertEquals("The task id " + taskId + " should not belong to user " + userId,
+ taskId / UserHandle.PER_USER_RANGE, userId);
+ }
}
}
}