Merge "Ignore PendingResults when checking for mutable implicit PendingIntents" into udc-dev (1af488af) · Commits · e / os / android_frameworks_base

core/java/android/app/PendingIntent.java

+18 −11

Original line number	Diff line number	Diff line
		@@ -407,7 +407,7 @@ public final class PendingIntent implements Parcelable {
		}

		private static void checkPendingIntent(int flags, @NonNull Intent intent,
		@NonNull Context context) {
		@NonNull Context context, boolean isActivityResultType) {
		final boolean isFlagImmutableSet = (flags & PendingIntent.FLAG_IMMUTABLE) != 0;
		final boolean isFlagMutableSet = (flags & PendingIntent.FLAG_MUTABLE) != 0;
		final String packageName = context.getPackageName();
		@@ -428,11 +428,12 @@ public final class PendingIntent implements Parcelable {
		throw new IllegalArgumentException(msg);
		}

		// For apps with target SDK < U, warn that creation or retrieval of a mutable
		// implicit PendingIntent will be blocked from target SDK U onwards for security
		// reasons. The block itself happens on the server side, but this warning has to
		// stay here to preserve the client side stack trace for app developers.
		if (isNewMutableDisallowedImplicitPendingIntent(flags, intent)
		// For apps with target SDK < U, warn that creation or retrieval of a mutable implicit
		// PendingIntent that is not of type {@link ActivityManager#INTENT_SENDER_ACTIVITY_RESULT}
		// will be blocked from target SDK U onwards for security reasons. The block itself
		// happens on the server side, but this warning has to stay here to preserve the client
		// side stack trace for app developers.
		if (isNewMutableDisallowedImplicitPendingIntent(flags, intent, isActivityResultType)
		&& !Compatibility.isChangeEnabled(BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT)) {
		String msg = "New mutable implicit PendingIntent: pkg=" + packageName
		+ ", action=" + intent.getAction()
		@@ -445,7 +446,13 @@ public final class PendingIntent implements Parcelable {

		/** @hide */
		public static boolean isNewMutableDisallowedImplicitPendingIntent(int flags,
		@NonNull Intent intent) {
		@NonNull Intent intent, boolean isActivityResultType) {
		if (isActivityResultType) {
		// Pending intents of type {@link ActivityManager#INTENT_SENDER_ACTIVITY_RESULT}
		// should be ignored as they are intrinsically tied to a target which means they
		// are already explicit.
		return false;
		}
		boolean isFlagNoCreateSet = (flags & PendingIntent.FLAG_NO_CREATE) != 0;
		boolean isFlagMutableSet = (flags & PendingIntent.FLAG_MUTABLE) != 0;
		boolean isImplicit = (intent.getComponent() == null) && (intent.getPackage() == null);
		@@ -534,7 +541,7 @@ public final class PendingIntent implements Parcelable {
		@NonNull Intent intent, int flags, Bundle options, UserHandle user) {
		String packageName = context.getPackageName();
		String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
		checkPendingIntent(flags, intent, context);
		checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
		try {
		intent.migrateExtraStreamToClipData(context);
		intent.prepareToLeaveProcess(context);
		@@ -668,7 +675,7 @@ public final class PendingIntent implements Parcelable {
		intents[i].migrateExtraStreamToClipData(context);
		intents[i].prepareToLeaveProcess(context);
		resolvedTypes[i] = intents[i].resolveTypeIfNeeded(context.getContentResolver());
		checkPendingIntent(flags, intents[i], context);
		checkPendingIntent(flags, intents[i], context, /* isActivityResultType */ false);
		}
		try {
		IIntentSender target =
		@@ -721,7 +728,7 @@ public final class PendingIntent implements Parcelable {
		Intent intent, int flags, UserHandle userHandle) {
		String packageName = context.getPackageName();
		String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
		checkPendingIntent(flags, intent, context);
		checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
		try {
		intent.prepareToLeaveProcess(context);
		IIntentSender target =
		@@ -800,7 +807,7 @@ public final class PendingIntent implements Parcelable {
		Intent intent, int flags, int serviceKind) {
		String packageName = context.getPackageName();
		String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
		checkPendingIntent(flags, intent, context);
		checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
		try {
		intent.prepareToLeaveProcess(context);
		IIntentSender target =

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -5190,7 +5190,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		throw new IllegalArgumentException(
		"Can't use FLAG_RECEIVER_BOOT_UPGRADE here");
		}
		if (PendingIntent.isNewMutableDisallowedImplicitPendingIntent(flags, intent)) {
		boolean isActivityResultType =
		type == ActivityManager.INTENT_SENDER_ACTIVITY_RESULT;
		if (PendingIntent.isNewMutableDisallowedImplicitPendingIntent(flags, intent,
		isActivityResultType)) {
		boolean isChangeEnabled = CompatChanges.isChangeEnabled(
		PendingIntent.BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT,
		owningUid);