Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev

2014-09-23 19:49:59 +00:00
parent 56ac947b69 39569afc9f
commit 193b27cd3d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -783,7 +783,7 @@ final class TaskRecord {
    int findEffectiveRootIndex() {
        int effectiveNdx = 0;
        final int topActivityNdx = mActivities.size() - 1;
-        for (int activityNdx = 0; activityNdx < topActivityNdx; ++activityNdx) {
+        for (int activityNdx = 0; activityNdx <= topActivityNdx; ++activityNdx) {
            final ActivityRecord r = mActivities.get(activityNdx);
            if (r.finishing) {
                continue;