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

Commit f6ae002a authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Add nullable annotations to startActivityAsUser" am: 743a4b78 

am: 2704d2f4

Change-Id: I9f52f733b219acaae437c452bc238f6933bb0cec
parents a8199804 2704d2f4

api/system-current.txt

+1 −1
Original line number Original line 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 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 @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 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 BACKUP_SERVICE = "backup";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String DYNAMIC_ANDROID_SERVICE = "dynamic_android";

    field public static final String DYNAMIC_ANDROID_SERVICE = "dynamic_android";

core/java/android/content/Context.java

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

     */

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    @SystemApi

    @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.");

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

    }

    }