Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8cf1baebb0b276b3dfdeefdfb85bc93857b5116a
This commit is contained in:
TreeHugger Robot
2021-06-08 16:02:15 +00:00
committed by Automerger Merge Worker
parent 3377dd7fd1 e054e5445b
commit 308414543d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/parsing/ApkLiteParseUtils.java
View File

@@ -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;