Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e27802 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 7e296254: Merge "Fix broken XML parsing idiom." 

* commit '7e296254':
  Fix broken XML parsing idiom.
parents 73a6702e 7e296254

services/java/com/android/server/am/CompatModePackages.java

+6 −1
Original line number Diff line number Diff line
@@ -64,9 +64,14 @@ public final class CompatModePackages { 
            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();

            }

            if (eventType == XmlPullParser.END_DOCUMENT) {

                return;

            }



            String tagName = parser.getName();

            if ("compat-packages".equals(tagName)) {

                eventType = parser.next();

services/java/com/android/server/am/UsageStatsService.java

+6 −1
Original line number Diff line number Diff line
@@ -396,9 +396,14 @@ 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();

            }

            if (eventType == XmlPullParser.END_DOCUMENT) {

                return;

            }



            String tagName = parser.getName();

            if ("usage-history".equals(tagName)) {

                String pkg = null;

services/java/com/android/server/content/SyncStorageEngine.java

+7 −1
Original line number Diff line number Diff line
@@ -1697,9 +1697,15 @@ public class SyncStorageEngine extends Handler { 
            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();

            }

            if (eventType == XmlPullParser.END_DOCUMENT) {

                Log.i(TAG, "No initial accounts");

                return;

            }



            String tagName = parser.getName();

            if ("accounts".equals(tagName)) {

                String listen = parser.getAttributeValue(null, XML_ATTR_LISTEN_FOR_TICKLES);