Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I354841110a919a4b46ee458770959393a0c88ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-06 23:22:43 +00:00
committed by Automerger Merge Worker
parent 95d0189113 98fcce4ad4
commit a0349424b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/Context.java
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()));
}
/**