Revert^2 "Allow IntentSender to use auto-opt-in" (c4d34dee) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,8 @@ public class ActivityOptions extends ComponentOptions {
		@IntDef(prefix = {"MODE_BACKGROUND_ACTIVITY_START_"}, value = {
		MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED,
		MODE_BACKGROUND_ACTIVITY_START_ALLOWED,
		MODE_BACKGROUND_ACTIVITY_START_DENIED})
		MODE_BACKGROUND_ACTIVITY_START_DENIED,
		MODE_BACKGROUND_ACTIVITY_START_COMPAT})
		public @interface BackgroundActivityStartMode {}
		/**
		* No explicit value chosen. The system will decide whether to grant privileges.
		@@ -117,6 +118,13 @@ public class ActivityOptions extends ComponentOptions {
		* Deny the {@link PendingIntent} to use the background activity start privileges.
		*/
		public static final int MODE_BACKGROUND_ACTIVITY_START_DENIED = 2;
		/**
		* Special behavior for compatibility.
		* Similar to {@link #MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED}
		*
		* @hide
		*/
		public static final int MODE_BACKGROUND_ACTIVITY_START_COMPAT = -1;

		/**
		* The package name that created the options.

core/java/android/app/ComponentOptions.java

+18 −29

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app;

		import static android.app.ActivityOptions.BackgroundActivityStartMode;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_COMPAT;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;

		@@ -54,7 +55,7 @@ public class ComponentOptions {
		public static final String KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION =
		"android.pendingIntent.backgroundActivityAllowedByPermission";

		private @Nullable Boolean mPendingIntentBalAllowed = null;
		private Integer mPendingIntentBalAllowed = MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;
		private boolean mPendingIntentBalAllowedByPermission = false;

		ComponentOptions() {
		@@ -65,12 +66,9 @@ public class ComponentOptions {
		// results they want, which is their loss.
		opts.setDefusable(true);

		boolean pendingIntentBalAllowedIsSetExplicitly =
		opts.containsKey(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED);
		if (pendingIntentBalAllowedIsSetExplicitly) {
		mPendingIntentBalAllowed =
		opts.getBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED);
		}
		opts.getInt(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED,
		MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);
		setPendingIntentBackgroundActivityLaunchAllowedByPermission(
		opts.getBoolean(
		KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION, false));
		@@ -85,7 +83,8 @@ public class ComponentOptions {
		* @hide
		*/
		@Deprecated public void setPendingIntentBackgroundActivityLaunchAllowed(boolean allowed) {
		mPendingIntentBalAllowed = allowed;
		mPendingIntentBalAllowed = allowed ? MODE_BACKGROUND_ACTIVITY_START_ALLOWED
		: MODE_BACKGROUND_ACTIVITY_START_DENIED;
		}

		/**
		@@ -98,11 +97,8 @@ public class ComponentOptions {
		* @hide
		*/
		@Deprecated public boolean isPendingIntentBackgroundActivityLaunchAllowed() {
		if (mPendingIntentBalAllowed == null) {
		// cannot return null, so return the value used up to API level 33 for compatibility
		return true;
		}
		return mPendingIntentBalAllowed;
		// cannot return all detail, so return the value used up to API level 33 for compatibility
		return mPendingIntentBalAllowed != MODE_BACKGROUND_ACTIVITY_START_DENIED;
		}

		/**
		@@ -119,16 +115,15 @@ public class ComponentOptions {
		@BackgroundActivityStartMode int state) {
		switch (state) {
		case MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED:
		mPendingIntentBalAllowed = null;
		break;
		case MODE_BACKGROUND_ACTIVITY_START_ALLOWED:
		mPendingIntentBalAllowed = true;
		break;
		case MODE_BACKGROUND_ACTIVITY_START_DENIED:
		mPendingIntentBalAllowed = false;
		case MODE_BACKGROUND_ACTIVITY_START_COMPAT:
		case MODE_BACKGROUND_ACTIVITY_START_ALLOWED:
		mPendingIntentBalAllowed = state;
		break;
		default:
		throw new IllegalArgumentException(state + " is not valid");
		// Assume that future values are some variant of allowing the start.
		mPendingIntentBalAllowed = MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
		break;
		}
		return this;
		}
		@@ -141,13 +136,7 @@ public class ComponentOptions {
		* @see #setPendingIntentBackgroundActivityStartMode(int)
		*/
		public @BackgroundActivityStartMode int getPendingIntentBackgroundActivityStartMode() {
		if (mPendingIntentBalAllowed == null) {
		return MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;
		} else if (mPendingIntentBalAllowed) {
		return MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
		} else {
		return MODE_BACKGROUND_ACTIVITY_START_DENIED;
		}
		return mPendingIntentBalAllowed;
		}

		/**
		@@ -170,8 +159,8 @@ public class ComponentOptions {
		/** @hide */
		public Bundle toBundle() {
		Bundle b = new Bundle();
		if (mPendingIntentBalAllowed != null) {
		b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);
		if (mPendingIntentBalAllowed != MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {
		b.putInt(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);
		}
		if (mPendingIntentBalAllowedByPermission) {
		b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,

core/java/android/content/IntentSender.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -60,6 +60,10 @@ import android.util.AndroidException;
		* {@link android.app.PendingIntent#getIntentSender() PendingIntent.getIntentSender()}.
		*/
		public class IntentSender implements Parcelable {
		private static final Bundle SEND_INTENT_DEFAULT_OPTIONS =
		ActivityOptions.makeBasic().setPendingIntentBackgroundActivityStartMode(
		ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_COMPAT).toBundle();

		@UnsupportedAppUsage
		private final IIntentSender mTarget;
		IBinder mWhitelistToken;
		@@ -161,7 +165,8 @@ public class IntentSender implements Parcelable {
		*/
		public void sendIntent(Context context, int code, Intent intent,
		OnFinished onFinished, Handler handler) throws SendIntentException {
		sendIntent(context, code, intent, onFinished, handler, null, null /* options */);
		sendIntent(context, code, intent, onFinished, handler, null,
		SEND_INTENT_DEFAULT_OPTIONS);
		}

		/**
		@@ -194,7 +199,7 @@ public class IntentSender implements Parcelable {
		OnFinished onFinished, Handler handler, String requiredPermission)
		throws SendIntentException {
		sendIntent(context, code, intent, onFinished, handler, requiredPermission,
		null /* options */);
		SEND_INTENT_DEFAULT_OPTIONS);
		}

		/**

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

+16 −5

Original line number	Diff line number	Diff line
		@@ -18,6 +18,10 @@ package com.android.server.am;

		import static android.app.ActivityManager.PROCESS_STATE_TOP;
		import static android.app.ActivityManager.START_SUCCESS;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_COMPAT;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;

		import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
		import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
		@@ -389,13 +393,20 @@ public final class PendingIntentRecord extends IIntentSender.Stub {

		private static BackgroundStartPrivileges getBackgroundStartPrivilegesAllowedByCaller(
		@Nullable Bundle options, int callingUid, @Nullable String callingPackage) {
		if (options == null \|\| !options.containsKey(
		ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED)) {
		if (options == null) {
		return getDefaultBackgroundStartPrivileges(callingUid, callingPackage);
		}
		return options.getBoolean(ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED)
		? BackgroundStartPrivileges.ALLOW_BAL
		: BackgroundStartPrivileges.NONE;
		switch (options.getInt(ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED,
		MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED)) {
		case MODE_BACKGROUND_ACTIVITY_START_DENIED:
		return BackgroundStartPrivileges.NONE;
		case MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED:
		return getDefaultBackgroundStartPrivileges(callingUid, callingPackage);
		case MODE_BACKGROUND_ACTIVITY_START_ALLOWED:
		case MODE_BACKGROUND_ACTIVITY_START_COMPAT:
		default:
		return BackgroundStartPrivileges.ALLOW_BAL;
		}
		}

		/**

services/core/java/com/android/server/wm/BackgroundActivityStartController.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
		import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
		import static android.app.ActivityOptions.BackgroundActivityStartMode;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_COMPAT;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED;
		import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;
		import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
		@@ -105,6 +106,7 @@ public class BackgroundActivityStartController {
		static final String AUTO_OPT_IN_NOT_PENDING_INTENT = "notPendingIntent";
		static final String AUTO_OPT_IN_CALL_FOR_RESULT = "callForResult";
		static final String AUTO_OPT_IN_SAME_UID = "sameUid";
		static final String AUTO_OPT_IN_COMPAT = "compatibility";

		/** If enabled the creator will not allow BAL on its behalf by default. */
		@ChangeId
		@@ -303,6 +305,10 @@ public class BackgroundActivityStartController {
		} else if (callingUid == realCallingUid && !balRequireOptInSameUid()) {
		mAutoOptInReason = AUTO_OPT_IN_SAME_UID;
		mAutoOptInCaller = false;
		} else if (realCallerBackgroundActivityStartMode
		== MODE_BACKGROUND_ACTIVITY_START_COMPAT) {
		mAutoOptInReason = AUTO_OPT_IN_COMPAT;
		mAutoOptInCaller = false;
		} else {
		mAutoOptInReason = null;
		mAutoOptInCaller = false;