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

Commit 116bc11f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix ApkLite parsing namespace" into sc-dev am: e054e544 

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

Change-Id: I0cbb98a869ca03d801fc4fe72c06f05919d59430
parents f4787026 e054e544

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ import android.util.AttributeSet; 
import android.util.Pair;

import android.util.Pair;

import android.util.Slog;

import android.util.Slog;





import com.android.internal.R;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;





import libcore.io.IoUtils;

import libcore.io.IoUtils;
@@ -357,14 +356,14 @@ public class ApkLiteParseUtils { 
                "versionCodeMajor",

                "versionCodeMajor",

                0);

                0);

        int revisionCode = parser.getAttributeIntValue(ANDROID_RES_NAMESPACE, "revisionCode", 0);

        int revisionCode = parser.getAttributeIntValue(ANDROID_RES_NAMESPACE, "revisionCode", 0);

        boolean coreApp = parser.getAttributeBooleanValue("", "coreApp", false);

        boolean coreApp = parser.getAttributeBooleanValue(null, "coreApp", false);

        boolean isolatedSplits = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

        boolean isolatedSplits = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isolatedSplits", false);

                "isolatedSplits", false);

        boolean isFeatureSplit = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

        boolean isFeatureSplit = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isFeatureSplit", false);

                "isFeatureSplit", false);

        boolean isSplitRequired = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

        boolean isSplitRequired = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isSplitRequired", false);

                "isSplitRequired", false);

        String configForSplit = parser.getAttributeValue(ANDROID_RES_NAMESPACE, "configForSplit");

        String configForSplit = parser.getAttributeValue(null, "configForSplit");





        int targetSdkVersion = DEFAULT_TARGET_SDK_VERSION;

        int targetSdkVersion = DEFAULT_TARGET_SDK_VERSION;

        int minSdkVersion = DEFAULT_MIN_SDK_VERSION;

        int minSdkVersion = DEFAULT_MIN_SDK_VERSION;