am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."

* commit 'f71f5e8957aa2495a708ea1c8ca9e19d9e1f0003': [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
2014-12-09 16:39:08 +00:00
parent afc5b22c22 f71f5e8957
commit 74a6601360
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2269,7 +2269,7 @@ final class ActivityStack {
                    // In this case, we want to finish this activity
                    // and everything above it, so be sneaky and pretend
                    // like these are all in the reply chain.
-                    end = numActivities - 1;
+                    end = activities.size() - 1;
                } else if (replyChainEnd < 0) {
                    end = i;
                } else {