| commit | f1673a1a7a8c18bf2a57fa4ff62a23a5fa6175e0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jul 04 02:06:49 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 04 02:06:49 2024 +0000 |
| tree | 97632262ca01d322896704d03197119ff968d87c | |
| parent | 244890ed013cd9559d1ac9594bb759df77032ef7 [diff] | |
| parent | 9220249061bd784f946796e3fb2d8f7b0c248a15 [diff] |
Merge "Fix the restriction of odm partition overlays" into main am: 2a49ddf673 am: 9220249061 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3159156 Change-Id: Ifcdf4596985c52a712e5d4bfefe18539326cd7f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 173fc5c..009e9b8 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -4568,7 +4568,7 @@ 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"