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)
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()));
}
/**
