diff options
| author | 2024-07-04 01:37:32 +0000 | |
|---|---|---|
| committer | 2024-07-04 01:37:32 +0000 | |
| commit | 9220249061bd784f946796e3fb2d8f7b0c248a15 (patch) | |
| tree | 600c0e76b78b8eda39fb8c815fae620ecfe78039 | |
| parent | 4e6e761f0547c7f5abb2a02dcbf381fd23712397 (diff) | |
| parent | 2a49ddf6734b90241a1f34efb1b1fead09acaa3a (diff) | |
Merge "Fix the restriction of odm partition overlays" into main am: 2a49ddf673
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3159156
Change-Id: I01170fb3b637ca7667ddf78ee18acfe77e2d1357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 6eac72d84fd4..1bdc58691114 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4553,7 +4553,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" |