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

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

Browse Source 
* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.
This commit is contained in:
Craig Mautner
2014-11-26 21:47:35 +00:00
committed by Android Git Automerger
parent d76737a732 200496b571
commit 980ce4bad0
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) {