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

Merge "ANR caused by incorrect cleanup in BroadcastQueue."

Browse Source
This commit is contained in:
Craig Mautner
2014-11-26 21:43:59 +00:00
committed by Gerrit Code Review
parent b802cd6767 04d0bb6e93
commit 200496b571
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.receiver = null;
r.intent.setComponent(null); r.intent.setComponent(null);
if (r.curApp != null) { if (r.curApp != null && r.curApp.curReceiver == r) {
r.curApp.curReceiver = null; r.curApp.curReceiver = null;
} }
if (r.curFilter != null) { if (r.curFilter != null) {