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

2023-02-06 19:38:57 +00:00
parent 538cb6588f d1b836e3dd
commit bff6b3b979
1 changed files with 2 additions and 1 deletions
--- 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()));
    }

    /**