From 6da3c59b9ee63028f0a2fb54e4bd440445232476 Mon Sep 17 00:00:00 2001 From: "gang.huang" Date: Wed, 3 Jul 2024 20:07:11 +0800 Subject: Fix the restriction of odm partition overlays The odm partition is an extension of the vendor partition, so the targetSdkVersion of an overlay package pre-built in odm partition should not below the SDK level required by vendor overlays, other than required by system overlays. Bug: 350902133 Test: presubmit Change-Id: I8ea561c80f66f5534d7a2f1ccf52c79e1edb0ffd --- services/core/java/com/android/server/pm/InstallPackageHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 89c4f0f276af..91990048e356 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4550,7 +4550,7 @@ final class InstallPackageHelper { PackageManagerException.INTERNAL_ERROR_SYSTEM_OVERLAY_STATIC); } } else { - if ((scanFlags & SCAN_AS_VENDOR) != 0) { + if ((scanFlags & (SCAN_AS_VENDOR | SCAN_AS_ODM)) != 0) { if (pkg.getTargetSdkVersion() < ScanPackageUtils.getVendorPartitionVersion()) { Slog.w(TAG, "System overlay " + pkg.getPackageName() + " targets an SDK below the required SDK level of vendor" -- cgit v1.2.3-59-g8ed1b