diff options
| author | 2020-12-01 18:42:42 +0000 | |
|---|---|---|
| committer | 2020-12-01 18:42:42 +0000 | |
| commit | ab130fd9054089faffaccda655f2edd9ee6ea601 (patch) | |
| tree | d7709c9b091ca7306a9e0fa10bc39ddac81bf835 | |
| parent | 613c93b98bc1d6d734778d5f3bbbde3c3a2ffd20 (diff) | |
| parent | a28de433d83456a828d68a81973541c52fc0a752 (diff) | |
Merge "Update CPA startActivity javadoc to refer to passing the result back"
| -rw-r--r-- | core/java/android/content/pm/CrossProfileApps.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java index 8b411d5fe031..b290679c9fcc 100644 --- a/core/java/android/content/pm/CrossProfileApps.java +++ b/core/java/android/content/pm/CrossProfileApps.java @@ -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 = { |