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

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

am 107eb740: am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix... 

am 107eb740: am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit '107eb740':
  Fix broken XML parsing idiom.
parents a7aa078f 107eb740

services/core/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/core/java/com/android/server/am/UsageStatsService.java

+6 −1
Original line number Diff line number Diff line
@@ -394,9 +394,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/core/java/com/android/server/content/SyncStorageEngine.java

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