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

Commit a32d3a51 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "Context: Make sendBroadcastMultiplePermissions a @SystemApi"

parents 7d1e27d6 3fe42f09

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,7 @@ package android.content { 
    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler);

    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 void sendBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[]);

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

    field public static final String APP_PREDICTION_SERVICE = "app_prediction";

core/java/android/content/Context.java

+6 −3
Original line number Diff line number Diff line
@@ -2072,7 +2072,7 @@ public abstract class Context { 
     *               Intent will receive the broadcast.

     * @param receiverPermissions Array of names of permissions that a receiver must hold

     *                            in order to receive your broadcast.

     *                            If null or empty, no permissions are required.

     *                            If empty, no permissions are required.

     *

     * @see android.content.BroadcastReceiver

     * @see #registerReceiver
@@ -2081,8 +2081,11 @@ public abstract class Context { 
     * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)

     * @hide

     */

    public abstract void sendBroadcastMultiplePermissions(Intent intent,

            String[] receiverPermissions);

    @SystemApi

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions) {

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

    }



    /**

     * Broadcast the given intent to all interested BroadcastReceivers, allowing

core/java/android/content/ContextWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ public class ContextWrapper extends Context { 


    /** @hide */

    @Override

    public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions) {

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions) {

        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions);

    }