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

Commit e879b2ae authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "Prevent ANR when broadcast receiver is killed"

parents ccce6e0f 4472fa97

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

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

    public void skipCurrentReceiverLocked(ProcessRecord app) {

        boolean reschedule = false;

        boolean reschedule = false;

        BroadcastRecord r = app.curReceiver;

        BroadcastRecord r = app.curReceiver;

        if (r != null) {

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

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

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

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

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

            // let the broadcast continue.

            // let the broadcast continue.