am 124fce2b: am af53bfd0: am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev

* commit '124fce2b3646f7a1f01f5830b5201f1baf30a226': Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
2014-11-04 22:46:22 +00:00
parent ed83a47d13 124fce2b36
commit 35d352a90e
1 changed files with 1 additions and 0 deletions
--- 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) {