Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2017-06-19 17:04:04 +00:00
committed by Android (Google) Code Review
parent 58df6ab93f 443d35a001
commit 8a95d49d8f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/BroadcastQueue.java
View File

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