Merge "Update CPA startActivity javadoc to refer to passing the result back" into rvc-qpr-dev (e9fd7678) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/CrossProfileApps.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -119,8 +119,9 @@ public class CrossProfileApps {
		* {@link #getTargetUserProfiles()} if different to the calling user, otherwise a
		* {@link SecurityException} will be thrown.
		* @param callingActivity The activity to start the new activity from for the purposes of
		* deciding which task the new activity should belong to. If {@code null}, the activity
		* will always be started in a new task.
		* passing back any result and deciding which task the new activity should belong to. If
		* {@code null}, the activity will always be started in a new task and no result will be
		* returned.
		*/
		@RequiresPermission(anyOf = {
		android.Manifest.permission.INTERACT_ACROSS_PROFILES,
		@@ -146,8 +147,9 @@ public class CrossProfileApps {
		* {@link #getTargetUserProfiles()} if different to the calling user, otherwise a
		* {@link SecurityException} will be thrown.
		* @param callingActivity The activity to start the new activity from for the purposes of
		* deciding which task the new activity should belong to. If {@code null}, the activity
		* will always be started in a new task.
		* passing back any result and deciding which task the new activity should belong to. If
		* {@code null}, the activity will always be started in a new task and no result will be
		* returned.
		* @param options The activity options or {@code null}. See {@link android.app.ActivityOptions}.
		*/
		@RequiresPermission(anyOf = {