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

Commit 337e999d authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Remove unneeded @RequiresPermission annotation" am: 0a1b4757 am: 277ea358 

am: ec296c8e

Change-Id: I2e8d0718a56bcc205f3fa93244b0ee9d8b367707
parents 8d6385aa ec296c8e

api/current.txt

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

    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 Original line Diff line number Diff line
@@ -2450,10 +2450,10 @@ public abstract class Context { 
     *

     *

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

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

     */

     */

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,

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

            @Nullable String receiverPermission, @Nullable String receiverAppOp,

            @Nullable String receiverAppOp, @Nullable BroadcastReceiver resultReceiver,

            @Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,

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

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

            @Nullable Bundle initialExtras) {

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

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

    }

    }