diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-03-11 20:25:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-11 20:25:48 +0000 |
| commit | f2afddb57dfbcbe35ccbeb4d66bfff99eb3e4c65 (patch) | |
| tree | ae2725575f1fb7d7df98bf6a2e571eb6d25d038a /core/java/android/content | |
| parent | 36818c414d5ccd23ea7bb68993b007aee50a8cc6 (diff) | |
| parent | 293ad6c6749044d97ea2a5f3fbd5c6ad58124584 (diff) | |
Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/RegisteredServicesCache.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java index aaa0917c70da..288d55f577f6 100644 --- a/core/java/android/content/pm/RegisteredServicesCache.java +++ b/core/java/android/content/pm/RegisteredServicesCache.java @@ -488,7 +488,8 @@ public abstract class RegisteredServicesCache<V> { 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(); |