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

Commit 277ea358 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Remove unneeded @RequiresPermission annotation" 

am: 0a1b4757

Change-Id: I47d83e0d224cb9840b326212f84c83a8e16c1a85
parents 0c7dcba3 0a1b4757

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9771,7 +9771,7 @@ package android.content { 
    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String);

    method public abstract void sendOrderedBroadcast(@RequiresPermission android.content.Intent, @Nullable String);

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

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

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

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void sendStickyBroadcast(@RequiresPermission android.content.Intent);

    method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void sendStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

core/java/android/content/Context.java

+4 −4
Original line number Diff line number Diff line
@@ -2429,10 +2429,10 @@ public abstract class Context { 
     *

     * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)

     */

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,

            @Nullable String receiverPermission, @Nullable String receiverAppOp,

            @Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,

            int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {

    public void sendOrderedBroadcast(@NonNull Intent intent, @Nullable String receiverPermission,

            @Nullable String receiverAppOp, @Nullable BroadcastReceiver resultReceiver,

            @Nullable Handler scheduler, int initialCode, @Nullable String initialData,

            @Nullable Bundle initialExtras) {

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

    }