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

[automerge] Null check on BroadcastRecord's receivers list. 2p: fc32f968d6

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

Bug: 227729678
Change-Id: I8ccb09aefbf9ccdf0da6f6b679b2568909f08dba
This commit is contained in:
Presubmit Automerger Backend
2022-04-06 18:09:59 +00:00
parent b74f621dfe fc32f968d6
commit 72476a70f6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/BroadcastDispatcher.java
View File

@@ -580,6 +580,11 @@ public class BroadcastDispatcher {
// ----------------------------------
// BroadcastQueue operation support
void enqueueOrderedBroadcastLocked(BroadcastRecord r) {
if (r.receivers == null || r.receivers.isEmpty()) {
mOrderedBroadcasts.add(r);
return;
}
if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(r.intent.getAction())) {
// Create one BroadcastRecord for each UID that can be deferred.
final SparseArray<BroadcastRecord> deferred =

4
services/core/java/com/android/server/am/BroadcastRecord.java
View File

@@ -414,6 +414,10 @@ final class BroadcastRecord extends Binder {
return ret;
}
if (receivers == null) {
return ret;
}
final String action = intent.getAction();
if (!Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action)
&& !Intent.ACTION_BOOT_COMPLETED.equals(action)) {