commit bff6b3b9791b0d3467de088d8fa03cc24d87af16
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 06 19:38:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 06 19:38:57 2023 +0000
tree a9c09a69266d631e911511b7c5e743f51a3fd6e0
parent 538cb6588f38e012a2289b1403787b41194964bb
parent d1b836e3dd35ac4bf5c416d1c31a304da15b96ec

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

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 415469a..b87fa11 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2323,7 +2323,8 @@
     @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()));
     }
 
     /**