commit 2a49ddf6734b90241a1f34efb1b1fead09acaa3a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 04 00:59:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 04 00:59:11 2024 +0000
tree f1e586e5e4eafe27f771d4220e465d2fbc005348
parent 2aa865d1bd17fcbe3cff457d37af7da7df45e65f
parent 6da3c59b9ee63028f0a2fb54e4bd440445232476

Merge "Fix the restriction of odm partition overlays" into main

services/core/java/com/android/server/pm/InstallPackageHelper.java

diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 89c4f0f..9199004 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 @@
                             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"