From a1e9e633423474c75adbac8c883f8a66c7809b35 Mon Sep 17 00:00:00 2001 From: Winson Date: Mon, 7 Jun 2021 18:16:11 -0700 Subject: 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 --- core/java/android/content/pm/parsing/ApkLiteParseUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java index 76b98659067f..1e650a807cec 100644 --- a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java +++ b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java @@ -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; -- cgit v1.2.3-59-g8ed1b