From 591cfa680ca737003e1242aa53493fe4fbdd395b Mon Sep 17 00:00:00 2001 From: Pedro Loureiro Date: Mon, 21 Feb 2022 18:02:03 +0000 Subject: [PATCH] Disable updatable system manifest for T Bug: 195732042 Merged-In: I6b890e5536c17dd53722e2c3a781c85dd9d6bdf0 Note: the merged-in id is not related with this change but is something that was already merged in internal master and we don't want this change to be merged there. Test: pre-submit + check auto-merger comment in the CL Change-Id: Idcff9b310ee3e7238e7fd4982d083d496fda9d9e --- .../com/android/server/pm/InitAndSystemPackageHelper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java index 06405ae32fcf3..6dbe9b6f89f68 100644 --- a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java +++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java @@ -30,7 +30,6 @@ import static com.android.server.pm.PackageManagerService.SCAN_NO_DEX; import static com.android.server.pm.PackageManagerService.SCAN_REQUIRE_KNOWN; import static com.android.server.pm.PackageManagerService.SYSTEM_PARTITIONS; import static com.android.server.pm.PackageManagerService.TAG; -import static com.android.server.pm.pkg.parsing.ParsingPackageUtils.PARSE_FRAMEWORK_RES_SPLITS; import android.annotation.Nullable; import android.content.pm.parsing.ApkLiteParseUtils; @@ -278,9 +277,8 @@ final class InitAndSystemPackageHelper { packageParser, executorService); } - List frameworkSplits = getFrameworkResApkSplitFiles(); - scanDirTracedLI(frameworkDir, frameworkSplits, - mSystemParseFlags | PARSE_FRAMEWORK_RES_SPLITS, + scanDirTracedLI(frameworkDir, null, + mSystemParseFlags, mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0, packageParser, executorService); if (!mPm.mPackages.containsKey("android")) {