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

Null check on BroadcastRecord's receivers list.

Browse Source 
Bug: 227729678
Test: adb shell "am broadcast -a android.intent.action.BOOT_COMPLETED -n com.android.providers.media/.MediaScannerReceiver"
Change-Id: If3c74a11ba76fa025a8dff0a7fc807e4bfa86119
This commit is contained in:
huiyu
2022-04-05 09:55:57 -07:00
parent 8629d70ac7
commit fc32f968d6
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 // BroadcastQueue operation support
void enqueueOrderedBroadcastLocked(BroadcastRecord r) { 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())) { if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(r.intent.getAction())) {
// Create one BroadcastRecord for each UID that can be deferred. // Create one BroadcastRecord for each UID that can be deferred.
final SparseArray<BroadcastRecord> 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; return ret;
} }
if (receivers == null) {
return ret;
}
final String action = intent.getAction(); final String action = intent.getAction();
if (!Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action) if (!Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action)
&& !Intent.ACTION_BOOT_COMPLETED.equals(action)) { && !Intent.ACTION_BOOT_COMPLETED.equals(action)) {