am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."

* commit '200496b5714675a31376e78977713fcbad775fb5': ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-26 21:47:35 +00:00
parent d76737a732 200496b571
commit 980ce4bad0
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) {