commit af53bfd06e701a1815a1c62a35020e70b76585c2
author Adam Lesinski <adamlesinski@google.com> Tue Nov 04 22:37:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 04 22:37:03 2014 +0000
tree 5658e4c29b7b3b0a9cabefa54080bf0d15881834
parent 9b32f9a46687c1f9d720452f8972e43f1d15294b
parent efd8a85d30c35ca4a274835f10e371289bb9bc5e

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

* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
  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) {