commit 124fce2b3646f7a1f01f5830b5201f1baf30a226
author Adam Lesinski <adamlesinski@google.com> Tue Nov 04 22:41:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 04 22:41:35 2014 +0000
tree d546b65dd1a0287725b387741cb8bb51c7182d43
parent ebb0bdb0f19b4f87f9080e37fb5a7ad540c0ccb2
parent af53bfd06e701a1815a1c62a35020e70b76585c2

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

services/usage/java/com/android/server/usage/UsageStatsDatabase.java

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 @@
                 if (!files.valueAt(start).getBaseFile().getName().endsWith("-c")) {
                     break;
                 }
+                start++;
             }
 
             if (start == fileCount - 1) {