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

Commit 13817fcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Throw XmlParserException when client tag cannot be found when parsing... 

Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev am: 4a487001

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827755

Change-Id: I62b7c336eae3cb50acd2a6e5bd251248b64315c7
parents 50c1b54d 4a487001

services/core/java/com/android/server/slice/SliceClientPermissions.java

+6 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ public class SliceClientPermissions implements DirtyTracker, Persistable { 
        // Get to the beginning of the provider.

        while (parser.getEventType() != XmlPullParser.START_TAG

                || !TAG_CLIENT.equals(parser.getName())) {

            if (parser.getEventType() == XmlPullParser.END_DOCUMENT) {

                throw new XmlPullParserException("Can't find client tag in xml");

            }

            parser.next();

        }

        int depth = parser.getDepth();
@@ -173,6 +176,9 @@ public class SliceClientPermissions implements DirtyTracker, Persistable { 
        parser.next();



        while (parser.getDepth() > depth) {

            if (parser.getEventType() == XmlPullParser.END_DOCUMENT) {

                return provider;

            }

            if (parser.getEventType() == XmlPullParser.START_TAG

                    && TAG_AUTHORITY.equals(parser.getName())) {

                try {