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

* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0': Prevent ANR when broadcast receiver is killed
2014-12-04 15:16:11 +00:00
parent 0ebbfaedd7 e879b2ae69
commit 6465980cd8
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -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.