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

Commit a7853c75 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev 

am: 8a95d49d

Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269
parents 92d86d59 8a95d49d

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

+4 −3
Original line number Diff line number Diff line
@@ -614,9 +614,10 @@ public final class BroadcastQueue { 
            skip = true;

        }



        if (!skip && (filter.receiverList.app == null || filter.receiverList.app.crashing)) {

        if (!skip && (filter.receiverList.app == null || filter.receiverList.app.killed

                || filter.receiverList.app.crashing)) {

            Slog.w(TAG, "Skipping deliver [" + mQueueName + "] " + r

                    + " to " + filter.receiverList + ": process crashing");

                    + " to " + filter.receiverList + ": process gone or crashing");

            skip = true;

        }
@@ -1317,7 +1318,7 @@ public final class BroadcastQueue { 
            }



            // Is this receiver's application already running?

            if (app != null && app.thread != null) {

            if (app != null && app.thread != null && !app.killed) {

                try {

                    app.addPackage(info.activityInfo.packageName,

                            info.activityInfo.applicationInfo.versionCode, mService.mProcessStats);