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

Commit a0349424 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Safely handle the case of BroadcastOptions being null." am: bff6b3b9 am: 98fcce4a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2421879



Change-Id: I354841110a919a4b46ee458770959393a0c88ece
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95d01891 98fcce4a

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()));

    }



    /**