Merge "Safely handle the case of BroadcastOptions being null." am: bff6b3b979

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2421879

Change-Id: I55741be83445e121e2dec8ed1d4f4ee13844c33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-06 21:53:10 +00:00
committed by Automerger Merge Worker

View File

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