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

Commit 224904e0 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev

parents efb81b9e d088027f

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.