summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-03-19 21:41:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 21:41:43 +0000
commit1888333d7e814d6681a327cf1f3eda10098e3620 (patch)
tree0b04ab8456612cdad6747b2486dec48b437156e0
parent0dc084865313a416246915c72b29c13cc3f404d4 (diff)
parentd4375b4713658c06001e9dba7105804c872fc199 (diff)
downloadframeworks_base-1888333d7e814d6681a327cf1f3eda10098e3620.zip
frameworks_base-1888333d7e814d6681a327cf1f3eda10098e3620.tar.gz
frameworks_base-1888333d7e814d6681a327cf1f3eda10098e3620.tar.bz2
am d4375b47: Merge "Fix loop limits." into klp-dev
* commit 'd4375b4713658c06001e9dba7105804c872fc199': 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;