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

Commit a1e9e633 authored by Winson's avatar Winson
Browse files

Fix ApkLite parsing namespace 

An empty string doesn't work, needs to be null.

And configForSplit is not android namespaced.

Bug: 189988327

Test: atest android.appsecurity.cts.IsolatedSplitsTests

Change-Id: I9599c609d69ff1d8bd281975126b81fb35d06247
parent 46620933

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

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

import android.util.Slog;



import com.android.internal.R;

import com.android.internal.util.ArrayUtils;



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

                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,

                "isolatedSplits", false);

        boolean isFeatureSplit = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isFeatureSplit", false);

        boolean isSplitRequired = parser.getAttributeBooleanValue(ANDROID_RES_NAMESPACE,

                "isSplitRequired", false);

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

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



        int targetSdkVersion = DEFAULT_TARGET_SDK_VERSION;

        int minSdkVersion = DEFAULT_MIN_SDK_VERSION;