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

Commit 743a4b78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add nullable annotations to startActivityAsUser"

parents 89bf100d ef8f7929

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,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);

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

    field public static final String BACKUP_SERVICE = "backup";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String DYNAMIC_ANDROID_SERVICE = "dynamic_android";

core/java/android/content/Context.java

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

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @SystemApi

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

    public void startActivityAsUser(@RequiresPermission @NonNull Intent intent,

            @NonNull UserHandle user) {

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

    }