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

Commit bff6b3b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 538cb658 d1b836e3

core/java/android/content/Context.java

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

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

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

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

        sendBroadcastMultiplePermissions(intent, receiverPermissions,

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

    }



    /**