am 205dc8f9: am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."

* commit '205dc8f94cfd469c2a845d9fb010efba7f9aaba9': ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-27 12:08:26 +00:00
parent a6f1257a33 205dc8f94c
commit f651225d58
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
@@ -352,7 +352,7 @@ public final class BroadcastQueue {
        }
        r.receiver = null;
        r.intent.setComponent(null);
-        if (r.curApp != null) {
+        if (r.curApp != null && r.curApp.curReceiver == r) {
            r.curApp.curReceiver = null;
        }
        if (r.curFilter != null) {