summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-03-19 21:46:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 21:46:18 +0000
commit674dd27ca17636360253a8f9ecdd7b382f3b5b8c (patch)
tree130798659565d58630bf426f5d3b88fa1ca45b1b
parentda47d79d34bd7a3d202b29a1a5b3852d7551cf56 (diff)
parent1888333d7e814d6681a327cf1f3eda10098e3620 (diff)
downloadframeworks_base-674dd27ca17636360253a8f9ecdd7b382f3b5b8c.zip
frameworks_base-674dd27ca17636360253a8f9ecdd7b382f3b5b8c.tar.gz
frameworks_base-674dd27ca17636360253a8f9ecdd7b382f3b5b8c.tar.bz2
am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev
* commit '1888333d7e814d6681a327cf1f3eda10098e3620': Fix loop limits.
-rw-r--r--services/java/com/android/server/am/TaskRecord.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/TaskRecord.java b/services/java/com/android/server/am/TaskRecord.java
index 5f32dbb..9105103 100644
--- a/services/java/com/android/server/am/TaskRecord.java
+++ b/services/java/com/android/server/am/TaskRecord.java
@@ -163,7 +163,7 @@ final class TaskRecord extends ThumbnailHolder {
final void setFrontOfTask() {
boolean foundFront = false;
final int numActivities = mActivities.size();
- for (int activityNdx = 0; numActivities < activityNdx; ++activityNdx) {
+ for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
final ActivityRecord r = mActivities.get(activityNdx);
if (foundFront || r.finishing) {
r.frontOfTask = false;