commit e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b
author Craig Mautner <cmautner@google.com> Thu Dec 04 21:50:45 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 21:50:46 2014 +0000
tree b977b5c94e5daec5767df618e74db327b9d85217
parent 93d47b4c05585c37117ac5ac44d810de63f9d008
parent 53964dac4b841ca549eeea33d2d0fd4a0105e67c

Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev

services/core/java/com/android/server/am/BroadcastQueue.java

diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index 48d47a7..9b7d0b2 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -352,7 +352,7 @@
         }
         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) {