commit | 5cbaaa3cb51ca807e9f0d19442bf830f5d3508de | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Tue Oct 29 13:39:26 2013 -0700 |
committer | Craig Mautner <cmautner@google.com> | Tue Oct 29 13:39:26 2013 -0700 |
tree | 1fa5ccbf8dfac06cac04dbfc7f869b5b8a0ffd83 | |
parent | 66b753b06bb265d3f5b25244856f8d827a9dc5af [diff] |
Do not fetch tasks that don't have activities. Fixes NullPointerException bug 11432611. Change-Id: I62e765750e2613ecfb79e13021631ed2cd4e79f3
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 2e5dedf..44ff3bc 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3408,6 +3408,9 @@ int numActivities = 0; int numRunning = 0; final ArrayList<ActivityRecord> activities = task.mActivities; + if (activities.isEmpty()) { + continue; + } for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) { r = activities.get(activityNdx);