Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev (8a95d49d) · Commits · e / os / android_frameworks_base

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);