Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8432cee0 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 

* commit '224904e0':
  Prevent ANR when broadcast receiver is killed
parents 461e7367 224904e0

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

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ public final class BroadcastQueue { 
    public void skipCurrentReceiverLocked(ProcessRecord app) {

        boolean reschedule = false;

        BroadcastRecord r = app.curReceiver;

        if (r != null) {

        if (r != null && r.queue == this) {

            // The current broadcast is waiting for this app's receiver

            // to be finished.  Looks like that's not going to happen, so

            // let the broadcast continue.