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

Commit 8d4c87b0 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Restrict AVD and VD parsing to the current element instead of the whole... 

Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev
parents 99224b31 1f859716

graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java

+5 −1
Original line number Diff line number Diff line
@@ -455,7 +455,11 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { 


        int eventType = parser.getEventType();

        float pathErrorScale = 1;

        while (eventType != XmlPullParser.END_DOCUMENT) {

        final int innerDepth = parser.getDepth() + 1;



        // Parse everything until the end of the animated-vector element.

        while (eventType != XmlPullParser.END_DOCUMENT

                && (parser.getDepth() >= innerDepth || eventType != XmlPullParser.END_TAG)) {

            if (eventType == XmlPullParser.START_TAG) {

                final String tagName = parser.getName();

                if (ANIMATED_VECTOR.equals(tagName)) {

graphics/java/android/graphics/drawable/VectorDrawable.java

+5 −1
Original line number Diff line number Diff line
@@ -744,7 +744,11 @@ public class VectorDrawable extends Drawable { 
        groupStack.push(state.mRootGroup);



        int eventType = parser.getEventType();

        while (eventType != XmlPullParser.END_DOCUMENT) {

        final int innerDepth = parser.getDepth() + 1;



        // Parse everything until the end of the vector element.

        while (eventType != XmlPullParser.END_DOCUMENT

                && (parser.getDepth() >= innerDepth || eventType != XmlPullParser.END_TAG)) {

            if (eventType == XmlPullParser.START_TAG) {

                final String tagName = parser.getName();

                final VGroup currentGroup = groupStack.peek();