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

Commit 6a92a9f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flags] Skip nested disabled manifest elements" into main

parents 2f2337d1 ae5a4d39

core/java/com/android/internal/pm/pkg/component/ComponentParseUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.text.TextUtils; 
import com.android.internal.pm.pkg.parsing.ParsingPackage;

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

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

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -62,6 +63,7 @@ public class ComponentParseUtils { 
                continue;

            }

            if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                XmlUtils.skipCurrentTag(parser);

                continue;

            }

core/java/com/android/internal/pm/pkg/component/InstallConstraintsTagParser.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.util.ArraySet; 
import com.android.internal.R;

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

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

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -82,6 +83,7 @@ public class InstallConstraintsTagParser { 
                return input.success(prefixes);

            } else if (type == XmlPullParser.START_TAG) {

                if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                    XmlUtils.skipCurrentTag(parser);

                    continue;

                }

                if (parser.getName().equals(TAG_FINGERPRINT_PREFIX)) {

core/java/com/android/internal/pm/pkg/component/ParsedActivityUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.internal.pm.pkg.parsing.ParsingPackage; 
import com.android.internal.pm.pkg.parsing.ParsingPackageUtils;

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

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -396,6 +397,7 @@ public class ParsedActivityUtils { 
                continue;

            }

            if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                XmlUtils.skipCurrentTag(parser);

                continue;

            }

core/java/com/android/internal/pm/pkg/component/ParsedIntentInfoUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.R; 
import com.android.internal.pm.pkg.parsing.ParsingPackage;

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

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

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -100,6 +101,7 @@ public class ParsedIntentInfoUtils { 
                continue;

            }

            if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                XmlUtils.skipCurrentTag(parser);

                continue;

            }
@@ -201,6 +203,7 @@ public class ParsedIntentInfoUtils { 
                continue;

            }

            if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                XmlUtils.skipCurrentTag(parser);

                continue;

            }

core/java/com/android/internal/pm/pkg/component/ParsedProviderUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.R; 
import com.android.internal.pm.pkg.parsing.ParsingPackage;

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

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

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -176,6 +177,7 @@ public class ParsedProviderUtils { 
                continue;

            }

            if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(pkg, parser)) {

                XmlUtils.skipCurrentTag(parser);

                continue;

            }