Merge "Revert "Check Bundle when creating/sending a PendingIntent"" into main (0056f713) · Commits · e / os / android_frameworks_base

core/java/android/app/PendingIntent.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -179,14 +179,6 @@ public final class PendingIntent implements Parcelable {
		@Overridable
		public static final long BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT = 236704164L;

		/**
		* Validate options passed in as bundle.
		* @hide
		*/
		@ChangeId
		@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
		public static final long PENDING_INTENT_OPTIONS_CHECK = 320664730L;

		/** @hide */
		@IntDef(flag = true,
		value = {

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.app.ActivityOptions;
		import android.app.AppGlobals;
		import android.app.PendingIntent;
		import android.app.PendingIntentStats;
		import android.app.compat.CompatChanges;
		import android.content.IIntentSender;
		import android.content.Intent;
		import android.os.Binder;
		@@ -137,11 +136,6 @@ public class PendingIntentController {
		+ "intent creator ("
		+ packageName
		+ ") because this option is meant for the pending intent sender");
		if (CompatChanges.isChangeEnabled(PendingIntent.PENDING_INTENT_OPTIONS_CHECK,
		callingUid)) {
		throw new IllegalArgumentException("pendingIntentBackgroundActivityStartMode "
		+ "must not be set when creating a PendingIntent");
		}
		opts.setPendingIntentBackgroundActivityStartMode(
		ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);
		}

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

+3 −9

Original line number	Diff line number	Diff line
		@@ -406,9 +406,6 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
		String resolvedType, IBinder allowlistToken, IIntentReceiver finishedReceiver,
		String requiredPermission, IBinder resultTo, String resultWho, int requestCode,
		int flagsMask, int flagsValues, Bundle options) {
		final int callingUid = Binder.getCallingUid();
		final int callingPid = Binder.getCallingPid();

		if (intent != null) intent.setDefusable(true);
		if (options != null) options.setDefusable(true);

		@@ -461,12 +458,6 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
		+ key.packageName
		+ ") because this option is meant for the pending intent "
		+ "creator");
		if (CompatChanges.isChangeEnabled(PendingIntent.PENDING_INTENT_OPTIONS_CHECK,
		callingUid)) {
		throw new IllegalArgumentException(
		"pendingIntentCreatorBackgroundActivityStartMode "
		+ "must not be set when sending a PendingIntent");
		}
		opts.setPendingIntentCreatorBackgroundActivityStartMode(
		ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);
		}
		@@ -503,6 +494,9 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
		}
		// We don't hold the controller lock beyond this point as we will be calling into AM and WM.

		final int callingUid = Binder.getCallingUid();
		final int callingPid = Binder.getCallingPid();

		// Only system senders can declare a broadcast to be alarm-originated. We check
		// this here rather than in the general case handling below to fail before the other
		// invocation side effects such as allowlisting.