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

am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev

Browse Source 
* commit '224904e01a2efb01c6276eb64fba531a3d30a42b':
  Prevent ANR when broadcast receiver is killed
This commit is contained in:
Craig Mautner
2014-12-04 19:52:21 +00:00
committed by Android Git Automerger
parent 461e73677d 224904e01a
commit 8432cee04f
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.