Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update CPA startActivity javadoc to refer to passing the result back" into rvc-qpr-dev am: e9fd7678bf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144034

Change-Id: I8c8dc5cb9910c977169d220d5ece84a2403ccade
This commit is contained in:
TreeHugger Robot
2020-12-04 14:05:18 +00:00
committed by Automerger Merge Worker
parent 89e6200f27 e9fd7678bf
commit 73d6176569
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/pm/CrossProfileApps.java
View File

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