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

Commit 3f4873ba authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Add startActivityAsUser to SystemApi"

parents 60b9ad2e bf1ecd19

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ package android.content { 
    method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);

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

    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_FULL) public void startActivityAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

    field public static final String BACKUP_SERVICE = "backup";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String EUICC_CARD_SERVICE = "euicc_card";

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -4735,7 +4735,7 @@ public class Activity extends ContextThemeWrapper 
    /**

     * @hide Implement to provide correct calling token.

     */

    @UnsupportedAppUsage

    @Override

    public void startActivityAsUser(Intent intent, UserHandle user) {

        startActivityAsUser(intent, null, user);

    }

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -1711,7 +1711,7 @@ public abstract class Context { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @UnsupportedAppUsage

    @SystemApi

    public void startActivityAsUser(@RequiresPermission Intent intent, UserHandle user) {

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

    }

core/java/android/content/ContextWrapper.java

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ public class ContextWrapper extends Context { 


    /** @hide */

    @Override

    @UnsupportedAppUsage

    public void startActivityAsUser(Intent intent, UserHandle user) {

        mBase.startActivityAsUser(intent, user);

    }