summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-11-04 22:32:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-04 22:32:31 +0000
commitefd8a85d30c35ca4a274835f10e371289bb9bc5e (patch)
tree2267adb4253c4e8a11d3fce628af1133a5452b2a
parent0610ff97f11d37d514ea20fcbd73a96ede3518ce (diff)
parent32e580604d7b0a093750178127693a804bea134c (diff)
downloadframeworks_base-efd8a85d30c35ca4a274835f10e371289bb9bc5e.zip
frameworks_base-efd8a85d30c35ca4a274835f10e371289bb9bc5e.tar.gz
frameworks_base-efd8a85d30c35ca4a274835f10e371289bb9bc5e.tar.bz2
Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev
-rw-r--r--services/usage/java/com/android/server/usage/UsageStatsDatabase.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
index 11da380..098b3ef 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
@@ -119,6 +119,7 @@ class UsageStatsDatabase {
if (!files.valueAt(start).getBaseFile().getName().endsWith("-c")) {
break;
}
+ start++;
}
if (start == fileCount - 1) {