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

Commit dd5f9395 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by android-build-merger
Browse files

Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev am: d6afc52a 

am: 4c161911

Change-Id: Ic15f43714d28afbd06d55afe779ff8eea06920c7
parents 797d7001 4c161911

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

+6 −2
Original line number Diff line number Diff line
@@ -9989,8 +9989,12 @@ public class PackageManagerService extends IPackageManager.Stub 
        }















        // Scan as privileged apps that share a user with a priv-app.













        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0) && !pkg.isPrivileged()













                && (pkg.mSharedUserId != null)) {













        final boolean skipVendorPrivilegeScan = ((scanFlags & SCAN_AS_VENDOR) != 0)













                && SystemProperties.getInt("ro.vndk.version", 28) < 28;













        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)













                && !pkg.isPrivileged()













                && (pkg.mSharedUserId != null)













                && !skipVendorPrivilegeScan) {















            SharedUserSetting sharedUserSetting = null;















            try {















                sharedUserSetting = mSettings.getSharedUserLPw(pkg.mSharedUserId, 0, 0, false);