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 'af53bfd06e701a1815a1c62a35020e70b76585c2': Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
2014-11-04 22:41:35 +00:00
parent ebb0bdb0f1 af53bfd06e
commit 124fce2b36
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) {