Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev

2014-11-04 22:32:30 +00:00
parent 0610ff97f1 32e580604d
commit efd8a85d30
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) {