Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1673a1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the restriction of odm partition overlays" into main am: 2a49ddf6 am: 92202490 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3159156



Change-Id: Ifcdf4596985c52a712e5d4bfefe18539326cd7f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 244890ed 92202490

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

+1 −1
Original line number Diff line number Diff line
@@ -4568,7 +4568,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"