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

Merge "BroadcastQueue: fix subtle soft/hard timeout bug."

Browse Source
This commit is contained in:
Jeff Sharkey
2022-11-10 17:19:07 +00:00
committed by Android (Google) Code Review
parent 25e1ad5ef3 3e4b28028b
commit 3039cd96b2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import static com.android.server.am.BroadcastRecord.isDeliveryStateTerminal;
import static com.android.server.am.OomAdjuster.OOM_ADJ_REASON_FINISH_RECEIVER;
import static com.android.server.am.OomAdjuster.OOM_ADJ_REASON_START_RECEIVER;
import android.annotation.DurationMillisLong;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UptimeMillisLong;
@@ -239,7 +240,11 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
}
case MSG_DELIVERY_TIMEOUT_SOFT: {
synchronized (mService) {
deliveryTimeoutSoftLocked((BroadcastProcessQueue) msg.obj);
final SomeArgs args = (SomeArgs) msg.obj;
final BroadcastProcessQueue queue = (BroadcastProcessQueue) args.arg1;
final long originalTimeout = args.argl1;
args.recycle();
deliveryTimeoutSoftLocked(queue, originalTimeout);
}
return true;
}
@@ -747,8 +752,11 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
queue.lastCpuDelayTime = queue.app.getCpuDelayTime();
final long timeout = r.isForeground() ? mFgConstants.TIMEOUT : mBgConstants.TIMEOUT;
final SomeArgs args = SomeArgs.obtain();
args.arg1 = queue;
args.argl1 = timeout;
mLocalHandler.sendMessageDelayed(
Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_SOFT, queue), timeout);
Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_SOFT, args), timeout);
}
if (r.allowBackgroundActivityStarts) {
@@ -835,15 +843,16 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
r.resultTo = null;
}
private void deliveryTimeoutSoftLocked(@NonNull BroadcastProcessQueue queue) {
private void deliveryTimeoutSoftLocked(@NonNull BroadcastProcessQueue queue,
@DurationMillisLong long originalTimeout) {
if (queue.app != null) {
// Instead of immediately triggering an ANR, extend the timeout by
// the amount of time the process was runnable-but-waiting; we're
// only willing to do this once before triggering an hard ANR
final long cpuDelayTime = queue.app.getCpuDelayTime() - queue.lastCpuDelayTime;
final long timeout = MathUtils.constrain(cpuDelayTime, 0, mConstants.TIMEOUT);
final long hardTimeout = MathUtils.constrain(cpuDelayTime, 0, originalTimeout);
mLocalHandler.sendMessageDelayed(
Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_HARD, queue), timeout);
Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_HARD, queue), hardTimeout);
} else {
deliveryTimeoutHardLocked(queue);
}