diff options
| author | 2023-02-06 19:38:57 +0000 | |
|---|---|---|
| committer | 2023-02-06 19:38:57 +0000 | |
| commit | bff6b3b9791b0d3467de088d8fa03cc24d87af16 (patch) | |
| tree | a9c09a69266d631e911511b7c5e743f51a3fd6e0 | |
| parent | 538cb6588f38e012a2289b1403787b41194964bb (diff) | |
| parent | d1b836e3dd35ac4bf5c416d1c31a304da15b96ec (diff) | |
Merge "Safely handle the case of BroadcastOptions being null."
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 415469aec3b1..b87fa11e5f67 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())); } /** |