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

Commit 200029a6 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't crash cleaning up not-yet-live state 

Broadcast cleanup can happen in some cases prior to launch of the
recipient app's process.  Make sure to check for this situation during
cleanup paths, otherwise null references happen.

Bug: 123598766
Test: manual
Change-Id: Ief4e7e5d47d581fd6db7ac79ef999b9e2dc1bfdc
parent b7c7d891

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

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ public final class BroadcastQueue { 
        if (state == BroadcastRecord.IDLE) {

            Slog.w(TAG, "finishReceiver [" + mQueueName + "] called but state is IDLE");

        }

        if (r.allowBackgroundActivityStarts) {

        if (r.allowBackgroundActivityStarts && r.curApp != null) {

            r.curApp.removeAllowBackgroundActivityStartsToken(r);

         }

        // If we're abandoning this broadcast before any receivers were actually spun up,