Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev

2013-03-11 20:25:47 +00:00
parent 36818c414d 293ad6c674
commit f2afddb57d
1 changed files with 2 additions and 1 deletions
--- 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();