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

Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev am: 938c3d933f am: cc0bb910b3

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

Change-Id: Id727240586880e67211d090717189aeac3151787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pedro Loureiro
2022-05-09 20:45:51 +00:00
committed by Automerger Merge Worker
parent 80e6efa582 cc0bb910b3
commit 0f484b4539
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -567,9 +567,14 @@ public class ApkLiteParseUtils {
targetCode = minCode; targetCode = minCode;
} }
boolean allowUnknownCodenames = false;
if ((flags & FrameworkParsingPackageUtils.PARSE_APK_IN_APEX) != 0) {
allowUnknownCodenames = true;
}
ParseResult<Integer> targetResult = FrameworkParsingPackageUtils.computeTargetSdkVersion( ParseResult<Integer> targetResult = FrameworkParsingPackageUtils.computeTargetSdkVersion(
targetVer, targetCode, SDK_CODENAMES, input, targetVer, targetCode, SDK_CODENAMES, input,
/* allowUnknownCodenames= */ false); allowUnknownCodenames);
if (targetResult.isError()) { if (targetResult.isError()) {
return input.error(targetResult); return input.error(targetResult);
} }

1
core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
View File

@@ -58,6 +58,7 @@ public class FrameworkParsingPackageUtils {
private static final int MAX_FILE_NAME_SIZE = 223; private static final int MAX_FILE_NAME_SIZE = 223;
public static final int PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY = 1 << 7; public static final int PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY = 1 << 7;
public static final int PARSE_APK_IN_APEX = 1 << 9;
/** /**
* Check if the given name is valid. * Check if the given name is valid.

3
services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
View File

@@ -392,6 +392,9 @@ public class ParsingPackageUtils {
if ((flags & PARSE_FRAMEWORK_RES_SPLITS) != 0) { if ((flags & PARSE_FRAMEWORK_RES_SPLITS) != 0) {
liteParseFlags = flags; liteParseFlags = flags;
} }
if ((flags & PARSE_APK_IN_APEX) != 0) {
liteParseFlags |= PARSE_APK_IN_APEX;
}
final ParseResult<PackageLite> liteResult = final ParseResult<PackageLite> liteResult =
ApkLiteParseUtils.parseClusterPackageLite(input, packageDir, frameworkSplits, ApkLiteParseUtils.parseClusterPackageLite(input, packageDir, frameworkSplits,
liteParseFlags); liteParseFlags);