summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroubeichen <oubeichen@gmail.com>2013-11-15 13:44:43 +0800
committeroubeichen <oubeichen@gmail.com>2013-12-04 19:43:11 +0800
commite35631781ae1bfdfd0c4e81a224590d3a2318760 (patch)
tree7fedc2c1a1961f92d56d9cde3a88da792380e494
parent9a2038377a3763d3a6f5631656b915ca7eb472a3 (diff)
downloadandroid_frameworks_base-e35631781ae1bfdfd0c4e81a224590d3a2318760.tar.gz
android_frameworks_base-e35631781ae1bfdfd0c4e81a224590d3a2318760.tar.bz2
android_frameworks_base-e35631781ae1bfdfd0c4e81a224590d3a2318760.zip
Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty.
This often occurs after an incomplete reboot/shutdown or battery pull. Change-Id: I4f01151f4051df4ae1b85fa460ec7a9e70122878
-rw-r--r--services/java/com/android/server/am/UsageStatsService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/UsageStatsService.java b/services/java/com/android/server/am/UsageStatsService.java
index 6dae4aa1754..dcdf966bdd7 100644
--- a/services/java/com/android/server/am/UsageStatsService.java
+++ b/services/java/com/android/server/am/UsageStatsService.java
@@ -366,7 +366,7 @@ public final class UsageStatsService extends IUsageStats.Stub {
XmlPullParser parser = Xml.newPullParser();
parser.setInput(fis, null);
int eventType = parser.getEventType();
- while (eventType != XmlPullParser.START_TAG) {
+ while (eventType != XmlPullParser.START_TAG && eventType != XmlPullParser.END_DOCUMENT) {
eventType = parser.next();
}
String tagName = parser.getName();