Merge "Stop marking apps as privileged if they are not signed properly." into main (9f07a2a5) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -4590,7 +4590,9 @@ final class InstallPackageHelper {

		private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg)
		throws PackageManagerException {
		if (!AndroidPackageLegacyUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null)) {
		if (!AndroidPackageLegacyUtils.isPrivileged(pkg)
		&& (pkg.getSharedUserId() != null)
		&& !pkg.isLeavingSharedUser()) {
		SharedUserSetting sharedUserSetting = null;
		try {
		synchronized (mPm.mLock) {
		@@ -4630,7 +4632,8 @@ final class InstallPackageHelper {
		if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)
		&& !AndroidPackageLegacyUtils.isPrivileged(pkg)
		&& (pkg.getSharedUserId() != null)
		&& !skipVendorPrivilegeScan) {
		&& !skipVendorPrivilegeScan
		&& !pkg.isLeavingSharedUser()) {
		SharedUserSetting sharedUserSetting = null;
		synchronized (mPm.mLock) {
		try {