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

Commit 48620c91 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Safely handle the case of BroadcastOptions being null."

parents 45d7f9c5 51a6ae01

core/java/android/content/Context.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -2346,7 +2346,8 @@ public abstract class Context { 
    @SystemApi

    @SystemApi

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable BroadcastOptions options) {

            @NonNull String[] receiverPermissions, @Nullable BroadcastOptions options) {

       sendBroadcastMultiplePermissions(intent, receiverPermissions, options.toBundle());

        sendBroadcastMultiplePermissions(intent, receiverPermissions,

                (options == null ? null : options.toBundle()));

    }

    }





    /**

    /**