Merge "Adds a start flag to set FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev (30cb5926) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6810,6 +6810,9 @@ public class Intent implements Parcelable, Cloneable {
	case "--activity-task-on-home":		case "--activity-task-on-home":
	intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);		intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);
	break;		break;
			case "--activity-match-external":
			intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL);
			break;
	case "--receiver-registered-only":		case "--receiver-registered-only":
	intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
	break;		break;
	@@ -6946,7 +6949,7 @@ public class Intent implements Parcelable, Cloneable {
	" [--activity-no-user-action] [--activity-previous-is-top]",		" [--activity-no-user-action] [--activity-previous-is-top]",
	" [--activity-reorder-to-front] [--activity-reset-task-if-needed]",		" [--activity-reorder-to-front] [--activity-reset-task-if-needed]",
	" [--activity-single-top] [--activity-clear-task]",		" [--activity-single-top] [--activity-clear-task]",
	" [--activity-task-on-home]",		" [--activity-task-on-home] [--activity-match-external]",
	" [--receiver-registered-only] [--receiver-replace-pending]",		" [--receiver-registered-only] [--receiver-replace-pending]",
	" [--receiver-foreground] [--receiver-no-abort]",		" [--receiver-foreground] [--receiver-no-abort]",
	" [--receiver-include-background]",		" [--receiver-include-background]",