Merge "Verfiy global apps with device owner" into mnc-dev (a4911ed9) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -10620,6 +10620,12 @@ public class PackageManagerService extends IPackageManager.Stub {
		final List<ComponentName> sufficientVerifiers = matchVerifiers(pkgLite,
		receivers, verificationState);

		// Apps installed for "all" users use the device owner to verify the app
		UserHandle verifierUser = getUser();
		if (verifierUser == UserHandle.ALL) {
		verifierUser = UserHandle.OWNER;
		}

		/*
		* If any sufficient verifiers were listed in the package
		* manifest, attempt to ask them.
		@@ -10635,8 +10641,7 @@ public class PackageManagerService extends IPackageManager.Stub {

		final Intent sufficientIntent = new Intent(verification);
		sufficientIntent.setComponent(verifierComponent);

		mContext.sendBroadcastAsUser(sufficientIntent, getUser());
		mContext.sendBroadcastAsUser(sufficientIntent, verifierUser);
		}
		}
		}
		@@ -10651,7 +10656,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		* target BroadcastReceivers have run.
		*/
		verification.setComponent(requiredVerifierComponent);
		mContext.sendOrderedBroadcastAsUser(verification, getUser(),
		mContext.sendOrderedBroadcastAsUser(verification, verifierUser,
		android.Manifest.permission.PACKAGE_VERIFICATION_AGENT,
		new BroadcastReceiver() {
		@Override