Merge "Add hidden flag in ActivityOptions to ignore PendingIntent creator... (417df3f1) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -365,6 +365,9 @@ public class ActivityOptions extends ComponentOptions {
	private static final String KEY_DISMISS_KEYGUARD_IF_INSECURE =		private static final String KEY_DISMISS_KEYGUARD_IF_INSECURE =
	"android.activity.dismissKeyguardIfInsecure";		"android.activity.dismissKeyguardIfInsecure";

			private static final String KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE =
			"android.activity.ignorePendingIntentCreatorForegroundState";

	/**		/**
	* @see #setLaunchCookie		* @see #setLaunchCookie
	* @hide		* @hide
	@@ -462,6 +465,7 @@ public class ActivityOptions extends ComponentOptions {
	private boolean mTransientLaunch;		private boolean mTransientLaunch;
	private PictureInPictureParams mLaunchIntoPipParams;		private PictureInPictureParams mLaunchIntoPipParams;
	private boolean mDismissKeyguardIfInsecure;		private boolean mDismissKeyguardIfInsecure;
			private boolean mIgnorePendingIntentCreatorForegroundState;

	/**		/**
	* Create an ActivityOptions specifying a custom animation to run when		* Create an ActivityOptions specifying a custom animation to run when
	@@ -1260,6 +1264,8 @@ public class ActivityOptions extends ComponentOptions {
	mIsEligibleForLegacyPermissionPrompt =		mIsEligibleForLegacyPermissionPrompt =
	opts.getBoolean(KEY_LEGACY_PERMISSION_PROMPT_ELIGIBLE);		opts.getBoolean(KEY_LEGACY_PERMISSION_PROMPT_ELIGIBLE);
	mDismissKeyguardIfInsecure = opts.getBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE);		mDismissKeyguardIfInsecure = opts.getBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE);
			mIgnorePendingIntentCreatorForegroundState = opts.getBoolean(
			KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE);
	}		}

	/**		/**
	@@ -1876,6 +1882,23 @@ public class ActivityOptions extends ComponentOptions {
	return mDismissKeyguardIfInsecure;		return mDismissKeyguardIfInsecure;
	}		}

			/**
			* Sets background activity launch logic won't use pending intent creator foreground state.
			* @hide
			*/
			public void setIgnorePendingIntentCreatorForegroundState(boolean state) {
			mIgnorePendingIntentCreatorForegroundState = state;
			}

			/**
			* @return whether background activity launch logic should use pending intent creator
			* foreground state.
			* @hide
			*/
			public boolean getIgnorePendingIntentCreatorForegroundState() {
			return mIgnorePendingIntentCreatorForegroundState;
			}

	/**		/**
	* Update the current values in this ActivityOptions from those supplied		* Update the current values in this ActivityOptions from those supplied
	* in <var>otherOptions</var>. Any values		* in <var>otherOptions</var>. Any values
	@@ -2140,6 +2163,10 @@ public class ActivityOptions extends ComponentOptions {
	if (mDismissKeyguardIfInsecure) {		if (mDismissKeyguardIfInsecure) {
	b.putBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE, mDismissKeyguardIfInsecure);		b.putBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE, mDismissKeyguardIfInsecure);
	}		}
			if (mIgnorePendingIntentCreatorForegroundState) {
			b.putBoolean(KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE,
			mIgnorePendingIntentCreatorForegroundState);
			}
	return b;		return b;
	}		}

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
	import android.annotation.UserIdInt;		import android.annotation.UserIdInt;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityManagerInternal;		import android.app.ActivityManagerInternal;
			import android.app.ActivityOptions;
	import android.app.AlarmManager;		import android.app.AlarmManager;
	import android.app.AppGlobals;		import android.app.AppGlobals;
	import android.app.AppOpsManager;		import android.app.AppOpsManager;
	@@ -970,13 +971,16 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
	intent.setComponent(provider.getInfoLocked(mContext).configure);		intent.setComponent(provider.getInfoLocked(mContext).configure);
	intent.setFlags(secureFlags);		intent.setFlags(secureFlags);

			final ActivityOptions options = ActivityOptions.makeBasic();
			options.setIgnorePendingIntentCreatorForegroundState(true);

	// All right, create the sender.		// All right, create the sender.
	final long identity = Binder.clearCallingIdentity();		final long identity = Binder.clearCallingIdentity();
	try {		try {
	return PendingIntent.getActivityAsUser(		return PendingIntent.getActivityAsUser(
	mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT		mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT
	\| PendingIntent.FLAG_IMMUTABLE \| PendingIntent.FLAG_CANCEL_CURRENT,		\| PendingIntent.FLAG_IMMUTABLE \| PendingIntent.FLAG_CANCEL_CURRENT,
	null, new UserHandle(provider.getUserId()))		options.toBundle(), new UserHandle(provider.getUserId()))
	.getIntentSender();		.getIntentSender();
	} finally {		} finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);

services/core/java/com/android/server/StorageManagerService.java

+5 −1

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

+72 −58

Original line number	Original line	Diff line number	Diff line
	@@ -1268,10 +1268,15 @@ class ActivityStarter {
	boolean allowBackgroundActivityStart, Intent intent, ActivityOptions checkedOptions) {		boolean allowBackgroundActivityStart, Intent intent, ActivityOptions checkedOptions) {
	// don't abort for the most important UIDs		// don't abort for the most important UIDs
	final int callingAppId = UserHandle.getAppId(callingUid);		final int callingAppId = UserHandle.getAppId(callingUid);
			final boolean useCallingUidState =
			originatingPendingIntent == null \|\| checkedOptions == null
			\|\| !checkedOptions.getIgnorePendingIntentCreatorForegroundState();
			if (useCallingUidState) {
	if (callingUid == Process.ROOT_UID \|\| callingAppId == Process.SYSTEM_UID		if (callingUid == Process.ROOT_UID \|\| callingAppId == Process.SYSTEM_UID
	\|\| callingAppId == Process.NFC_UID) {		\|\| callingAppId == Process.NFC_UID) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {
	Slog.d(TAG, "Activity start allowed for important callingUid (" + callingUid + ")");		Slog.d(TAG,
			"Activity start allowed for important callingUid (" + callingUid + ")");
	}		}
	return false;		return false;
	}		}
	@@ -1279,7 +1284,8 @@ class ActivityStarter {
	// Always allow home application to start activities.		// Always allow home application to start activities.
	if (isHomeApp(callingUid, callingPackage)) {		if (isHomeApp(callingUid, callingPackage)) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {
	Slog.d(TAG, "Activity start allowed for home app callingUid (" + callingUid + ")");		Slog.d(TAG,
			"Activity start allowed for home app callingUid (" + callingUid + ")");
	}		}
	return false;		return false;
	}		}
	@@ -1292,6 +1298,7 @@ class ActivityStarter {
	}		}
	return false;		return false;
	}		}
			}

	// This is used to block background activity launch even if the app is still		// This is used to block background activity launch even if the app is still
	// visible to user after user clicking home button.		// visible to user after user clicking home button.
	@@ -1310,9 +1317,11 @@ class ActivityStarter {
	// is allowed, or apps like live wallpaper with non app visible window will be allowed.		// is allowed, or apps like live wallpaper with non app visible window will be allowed.
	final boolean appSwitchAllowedOrFg =		final boolean appSwitchAllowedOrFg =
	appSwitchState == APP_SWITCH_ALLOW \|\| appSwitchState == APP_SWITCH_FG_ONLY;		appSwitchState == APP_SWITCH_ALLOW \|\| appSwitchState == APP_SWITCH_FG_ONLY;
	if (((appSwitchAllowedOrFg \|\| mService.mActiveUids.hasNonAppVisibleWindow(callingUid))		final boolean allowCallingUidStartActivity =
			((appSwitchAllowedOrFg \|\| mService.mActiveUids.hasNonAppVisibleWindow(callingUid))
	&& callingUidHasAnyVisibleWindow)		&& callingUidHasAnyVisibleWindow)
	\|\| isCallingUidPersistentSystemProcess) {		\|\| isCallingUidPersistentSystemProcess;
			if (useCallingUidState && allowCallingUidStartActivity) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {
	Slog.d(TAG, "Activity start allowed: callingUidHasAnyVisibleWindow = " + callingUid		Slog.d(TAG, "Activity start allowed: callingUidHasAnyVisibleWindow = " + callingUid
	+ ", isCallingUidPersistentSystemProcess = "		+ ", isCallingUidPersistentSystemProcess = "
	@@ -1400,8 +1409,10 @@ class ActivityStarter {
	return false;		return false;
	}		}
	}		}
			if (useCallingUidState) {
	// don't abort if the callingUid has START_ACTIVITIES_FROM_BACKGROUND permission		// don't abort if the callingUid has START_ACTIVITIES_FROM_BACKGROUND permission
	if (mService.checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)		if (mService.checkPermission(
			START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)
	== PERMISSION_GRANTED) {		== PERMISSION_GRANTED) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {
	Slog.d(TAG,		Slog.d(TAG,
	@@ -1429,7 +1440,8 @@ class ActivityStarter {
	}		}
	// don't abort if the callingUid has companion device		// don't abort if the callingUid has companion device
	final int callingUserId = UserHandle.getUserId(callingUid);		final int callingUserId = UserHandle.getUserId(callingUid);
	if (mService.isAssociatedCompanionApp(callingUserId, callingUid)) {		if (mService.isAssociatedCompanionApp(callingUserId,
			callingUid)) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {
	Slog.d(TAG, "Background activity start allowed: callingUid (" + callingUid		Slog.d(TAG, "Background activity start allowed: callingUid (" + callingUid
	+ ") is companion app");		+ ") is companion app");
	@@ -1437,11 +1449,13 @@ class ActivityStarter {
	return false;		return false;
	}		}
	// don't abort if the callingUid has SYSTEM_ALERT_WINDOW permission		// don't abort if the callingUid has SYSTEM_ALERT_WINDOW permission
	if (mService.hasSystemAlertWindowPermission(callingUid, callingPid, callingPackage)) {		if (mService.hasSystemAlertWindowPermission(callingUid,
			callingPid, callingPackage)) {
	Slog.w(TAG, "Background activity start for " + callingPackage		Slog.w(TAG, "Background activity start for " + callingPackage
	+ " allowed because SYSTEM_ALERT_WINDOW permission is granted.");		+ " allowed because SYSTEM_ALERT_WINDOW permission is granted.");
	return false;		return false;
	}		}
			}
	// If we don't have callerApp at this point, no caller was provided to startActivity().		// If we don't have callerApp at this point, no caller was provided to startActivity().
	// That's the case for PendingIntent-based starts, since the creator's process might not be		// That's the case for PendingIntent-based starts, since the creator's process might not be
	// up and alive. If that's the case, we retrieve the WindowProcessController for the send()		// up and alive. If that's the case, we retrieve the WindowProcessController for the send()
	@@ -1452,7 +1466,7 @@ class ActivityStarter {
	callerAppUid = realCallingUid;		callerAppUid = realCallingUid;
	}		}
	// don't abort if the callerApp or other processes of that uid are allowed in any way		// don't abort if the callerApp or other processes of that uid are allowed in any way
	if (callerApp != null) {		if (callerApp != null && useCallingUidState) {
	// first check the original calling process		// first check the original calling process
	if (callerApp.areBackgroundActivityStartsAllowed(appSwitchState)) {		if (callerApp.areBackgroundActivityStartsAllowed(appSwitchState)) {
	if (DEBUG_ACTIVITY_STARTS) {		if (DEBUG_ACTIVITY_STARTS) {