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

Commit b66b0908 authored by Charles Chen's avatar Charles Chen
Browse files

Revert "Revert "Promote startActivityAsUser to SystemApi"" 

This reverts commit 07f7f3ff.

Currently, Context#startActivityAsUser(Intent, UserHandle) has
already been a System API. This CL furthur makes
startActivityAsUser with ActivityOptions a System API.
This is enssential to launch an Activity to the secondary display
by setting launched display ID in ActivityOptions.

This also align the behavior of startActivity. We made all versions
of startActivity public APIs.

Bug: 199829817
Change-Id: I334c2a98483e709559162ad64f3b69cbd3b615d2
Test: atest AnnotationTest
CTS-Coverage-Bug: 222189824
parent b4620e28

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ package android.app { 
    method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);

    method @Deprecated public boolean isBackgroundVisibleBehind();

    method @Deprecated public void onBackgroundVisibleBehindChanged(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityAsUser(@NonNull android.content.Intent, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, int, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, @NonNull String, int, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);
@@ -2945,6 +2944,7 @@ package android.content { 
    method public void sendBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[], @Nullable android.app.BroadcastOptions);

    method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

    field public static final String AMBIENT_CONTEXT_SERVICE = "ambient_context";

    field public static final String APP_HIBERNATION_SERVICE = "app_hibernation";

    field public static final String APP_INTEGRITY_SERVICE = "app_integrity";

core/java/android/app/Activity.java

+0 −1
Original line number Diff line number Diff line
@@ -5663,7 +5663,6 @@ public class Activity extends ContextThemeWrapper 
     * @throws ActivityNotFoundException  

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})

    public void startActivityAsUser(@NonNull Intent intent,

            @Nullable Bundle options, @NonNull UserHandle user) {

core/java/android/content/Context.java

+3 −3
Original line number Diff line number Diff line
@@ -2011,9 +2011,9 @@ public abstract class Context { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)

    @UnsupportedAppUsage

    public void startActivityAsUser(@RequiresPermission Intent intent, @Nullable Bundle options,

            UserHandle userId) {

    @SystemApi

    public void startActivityAsUser(@RequiresPermission @NonNull Intent intent,

            @Nullable Bundle options, @NonNull UserHandle userId) {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }