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

* commit '74a660136096d0ab10fe8d0f99c63ef535aa5552': [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
2014-12-09 16:45:53 +00:00
parent d50a5e7486 74a6601360
commit 40c5c0ef16
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
@@ -2274,7 +2274,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 {