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

Commit d8a309c9 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Revert "filter flagged xml elements" 

This reverts commit 5771a6cc.

Reason for revert: DroidMonitor: Potential culprit for http://b/396149867 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I80175d7d74a1c30ae83434a9f9fce3b2ada85550
parent 5771a6cc

core/java/android/content/res/XmlBlock.java

+0 −20
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ import android.ravenwood.annotation.RavenwoodKeepWholeClass; 
import android.util.TypedValue;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.pm.pkg.component.AconfigFlags;

import com.android.internal.pm.pkg.parsing.ParsingPackageUtils;

import com.android.internal.util.XmlUtils;



import dalvik.annotation.optimization.CriticalNative;
@@ -52,7 +50,6 @@ import java.io.Reader; 
@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)

public final class XmlBlock implements AutoCloseable {

    private static final boolean DEBUG=false;

    public static final String ANDROID_RESOURCES = "http://schemas.android.com/apk/res/android";



    @UnsupportedAppUsage

    public XmlBlock(byte[] data) {
@@ -346,23 +343,6 @@ public final class XmlBlock implements AutoCloseable { 
            if (ev == ERROR_BAD_DOCUMENT) {

                throw new XmlPullParserException("Corrupt XML binary file");

            }

            if (Flags.layoutReadwriteFlags() && ev == START_TAG) {

                AconfigFlags flags = ParsingPackageUtils.getAconfigFlags();

                if (flags.skipCurrentElement(/* pkg= */ null, this)) {

                    int depth = 1;

                    while (depth > 0) {

                        int ev2 = nativeNext(mParseState);

                        if (ev2 == ERROR_BAD_DOCUMENT) {

                            throw new XmlPullParserException("Corrupt XML binary file");

                        } else if (ev2 == START_TAG) {

                            depth++;

                        } else if (ev2 == END_TAG) {

                            depth--;

                        }

                    }

                    return next();

                }

            }

            if (mDecNextDepth) {

                mDepth--;

                mDecNextDepth = false;