Merge "Extend activity options pending intent flags to support multiple task" into main (0e84b3e6) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIO
	import static android.Manifest.permission.START_TASKS_FROM_RECENTS;		import static android.Manifest.permission.START_TASKS_FROM_RECENTS;
	import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
	import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
			import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
	import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;		import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
	import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;		import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
	import static android.view.Display.INVALID_DISPLAY;		import static android.view.Display.INVALID_DISPLAY;
	@@ -1849,7 +1850,7 @@ public class ActivityOptions extends ComponentOptions {
	public int getPendingIntentLaunchFlags() {		public int getPendingIntentLaunchFlags() {
	// b/243794108: Ignore all flags except the new task flag, to be reconsidered in b/254490217		// b/243794108: Ignore all flags except the new task flag, to be reconsidered in b/254490217
	return mPendingIntentLaunchFlags &		return mPendingIntentLaunchFlags &
	(FLAG_ACTIVITY_NEW_TASK \| FLAG_RECEIVER_FOREGROUND);		(FLAG_ACTIVITY_NEW_TASK \| FLAG_ACTIVITY_MULTIPLE_TASK \| FLAG_RECEIVER_FOREGROUND);
	}		}

	/**		/**