From d1b836e3dd35ac4bf5c416d1c31a304da15b96ec Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 3 Jan 2023 13:14:37 -0800
Subject: [PATCH] Safely handle the case of BroadcastOptions being null.

BroadcastOptions argument in Context#sendBroadcastMultiplePermissions
API is marked as @Nullable but would result in NPE if a null
BroadcastOptions is passed.

Bug: 264293164
Fix: 261957150
Test: TH
Merged-In: I0847a189bf945d8aa051133c7cff277a8692272d
Change-Id: I0847a189bf945d8aa051133c7cff277a8692272d
(cherry picked from commit 51a6ae01b8f33231b0653fa044882d5b1e926a9a)
---
 core/java/android/content/Context.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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