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

Merge "Prevent ANR when broadcast receiver is killed"

Browse Source
This commit is contained in:
Craig Mautner
2014-12-04 01:56:39 +00:00
committed by Gerrit Code Review
parent ccce6e0f9f 4472fa9780
commit e879b2ae69
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/BroadcastQueue.java
View File

@@ -296,7 +296,7 @@ public final class BroadcastQueue {
public void skipCurrentReceiverLocked(ProcessRecord app) { public void skipCurrentReceiverLocked(ProcessRecord app) {
boolean reschedule = false; boolean reschedule = false;
BroadcastRecord r = app.curReceiver; BroadcastRecord r = app.curReceiver;
if (r != null) { if (r != null && r.queue == this) {
// The current broadcast is waiting for this app's receiver // The current broadcast is waiting for this app's receiver
// to be finished. Looks like that's not going to happen, so // to be finished. Looks like that's not going to happen, so
// let the broadcast continue. // let the broadcast continue.