diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-04 13:39:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-04 13:39:26 +0000 |
| commit | e9fd7678bf8d953e2c3e50237f24a6037ed87c85 (patch) | |
| tree | c1b80cd9d46a0f360e451a055ce7f6e942b0084c /core/java/android | |
| parent | c905bf06a0b1601c3fc0723f3e8a8bddd6611873 (diff) | |
| parent | fabbba0c8a937227ac619cf129f9df5cc893e05f (diff) | |
Merge "Update CPA startActivity javadoc to refer to passing the result back" into rvc-qpr-dev
Diffstat (limited to 'core/java/android')
| -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 3b6740ef7343..f6fa6dde579b 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 = { |