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

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

Browse Source 
* commit 'e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b':
  ANR caused by incorrect cleanup in BroadcastQueue.
This commit is contained in:
Craig Mautner
2014-12-04 21:58:13 +00:00
committed by Android Git Automerger
parent 95cce9d57e e0dc40c0f2
commit a32933fdfe
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

@@ -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) {