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

Merge "Finish receiver synchronously when broadcast can be skipped." into udc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2023-03-09 22:32:56 +00:00
committed by Android (Google) Code Review
parent 4df2f38499 79487fcab2
commit a8df8fa1d2
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/am/BroadcastQueueModernImpl.java
View File

@@ -52,7 +52,6 @@ import android.app.usage.UsageEvents.Event;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -224,22 +223,12 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
private static final int MSG_DELIVERY_TIMEOUT_HARD = 3; private static final int MSG_DELIVERY_TIMEOUT_HARD = 3;
private static final int MSG_BG_ACTIVITY_START_TIMEOUT = 4; private static final int MSG_BG_ACTIVITY_START_TIMEOUT = 4;
private static final int MSG_CHECK_HEALTH = 5; private static final int MSG_CHECK_HEALTH = 5;
private static final int MSG_FINISH_RECEIVER = 6;
private void enqueueUpdateRunningList() { private void enqueueUpdateRunningList() {
mLocalHandler.removeMessages(MSG_UPDATE_RUNNING_LIST); mLocalHandler.removeMessages(MSG_UPDATE_RUNNING_LIST);
mLocalHandler.sendEmptyMessage(MSG_UPDATE_RUNNING_LIST); mLocalHandler.sendEmptyMessage(MSG_UPDATE_RUNNING_LIST);
} }
private void enqueueFinishReceiver(@NonNull BroadcastProcessQueue queue,
@DeliveryState int deliveryState, @NonNull String reason) {
final SomeArgs args = SomeArgs.obtain();
args.arg1 = queue;
args.argi1 = deliveryState;
args.arg2 = reason;
mLocalHandler.sendMessage(Message.obtain(mLocalHandler, MSG_FINISH_RECEIVER, args));
}
private final Handler mLocalHandler; private final Handler mLocalHandler;
private final Handler.Callback mLocalCallback = (msg) -> { private final Handler.Callback mLocalCallback = (msg) -> {
@@ -278,17 +267,6 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
} }
return true; return true;
} }
case MSG_FINISH_RECEIVER: {
synchronized (mService) {
final SomeArgs args = (SomeArgs) msg.obj;
final BroadcastProcessQueue queue = (BroadcastProcessQueue) args.arg1;
final int deliveryState = args.argi1;
final String reason = (String) args.arg2;
args.recycle();
finishReceiverActiveLocked(queue, deliveryState, reason);
}
return true;
}
} }
return false; return false;
}; };
@@ -727,7 +705,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
// Ignore registered receivers from a previous PID // Ignore registered receivers from a previous PID
if (receiver instanceof BroadcastFilter) { if (receiver instanceof BroadcastFilter) {
mRunningColdStart = null; mRunningColdStart = null;
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_SKIPPED, finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_SKIPPED,
"BroadcastFilter for cold app"); "BroadcastFilter for cold app");
return; return;
} }
@@ -758,7 +736,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
hostingRecord, zygotePolicyFlags, allowWhileBooting, false); hostingRecord, zygotePolicyFlags, allowWhileBooting, false);
if (queue.app == null) { if (queue.app == null) {
mRunningColdStart = null; mRunningColdStart = null;
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_FAILURE, finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_FAILURE,
"startProcessLocked failed"); "startProcessLocked failed");
return; return;
} }
@@ -800,7 +778,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
@NonNull BroadcastRecord r, int index) { @NonNull BroadcastRecord r, int index) {
final String reason = shouldSkipReceiver(queue, r, index); final String reason = shouldSkipReceiver(queue, r, index);
if (reason != null) { if (reason != null) {
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_SKIPPED, reason); finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_SKIPPED, reason);
return true; return true;
} }
return false; return false;
@@ -914,7 +892,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
// TODO: consider making registered receivers of unordered // TODO: consider making registered receivers of unordered
// broadcasts report results to detect ANRs // broadcasts report results to detect ANRs
if (assumeDelivered) { if (assumeDelivered) {
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_DELIVERED, finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_DELIVERED,
"assuming delivered"); "assuming delivered");
} }
} else { } else {
@@ -932,10 +910,10 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
logw(msg); logw(msg);
app.killLocked("Can't deliver broadcast", ApplicationExitInfo.REASON_OTHER, app.killLocked("Can't deliver broadcast", ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_UNDELIVERED_BROADCAST, true); ApplicationExitInfo.SUBREASON_UNDELIVERED_BROADCAST, true);
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_FAILURE, "remote app"); finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_FAILURE, "remote app");
} }
} else { } else {
enqueueFinishReceiver(queue, BroadcastRecord.DELIVERY_FAILURE, finishReceiverActiveLocked(queue, BroadcastRecord.DELIVERY_FAILURE,
"missing IApplicationThread"); "missing IApplicationThread");
} }
} }