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

am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

Browse Source 
* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed
This commit is contained in:
Craig Mautner
2014-12-04 19:51:23 +00:00
committed by Android Git Automerger
parent e762f986c4 6465980cd8
commit b3c60bcb51
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) {
boolean reschedule = false;
BroadcastRecord r = app.curReceiver;
if (r != null) {
if (r != null && r.queue == this) {
// The current broadcast is waiting for this app's receiver
// to be finished. Looks like that's not going to happen, so
// let the broadcast continue.