Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fabbba0c authored by Alex Kershaw's avatar Alex Kershaw
Browse files

Update CPA startActivity javadoc to refer to passing the result back 

Update both versions of CrossProfileApps#startActivity to refer to
passing the result back to the passed in calling activity.

Bug: 174506563
Fixes: 171957840
Test: atest com.android.cts.devicepolicy.CrossProfileAppsHostSideTest#testStartActivityIntent_crossProfile_returnsResult
Change-Id: I14bf779d9307232b31300b828a1606c7411c7bb3
parent 47c03c49

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -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 = {