Merge "Fix a problem in finish affinity in Activity Manager." into jb-dev

Amith Yamasani · Android (Google) Code Review · commit 0aeb05e6ded3 · 2012-05-15T12:01:55.000-07:00
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
@@ -3543,7 +3543,7 @@ final boolean finishActivityAffinityLocked(IBinder token) {
         }
         ActivityRecord r = mHistory.get(index);
 
-        while (index > 0) {
+        while (index >= 0) {
             ActivityRecord cur = mHistory.get(index);
             if (cur.task != r.task) {
                 break;

Original file line number	Diff line number	Diff line change
`@@ -3543,7 +3543,7 @@ final boolean finishActivityAffinityLocked(IBinder token) {`
`3543`	`3543`	`}`
`3544`	`3544`	`ActivityRecord r = mHistory.get(index);`
`3545`	`3545`
`3546`		`- while (index > 0) {`
	`3546`	`+ while (index >= 0) {`
`3547`	`3547`	`ActivityRecord cur = mHistory.get(index);`
`3548`	`3548`	`if (cur.task != r.task) {`
`3549`	`3549`	`break;`