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

Commit 89d87f04 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

BroadcastQueue: fix subtle soft/hard timeout bug. 

deliveryTimeoutSoftLocked() had been using mConstants.TIMEOUT for
clamping purposes, but that always ended up being the foreground
timeout, even for background broadcasts.

Fix this bug by passing through the actual ANR timeout value used,
and apply that for clamping purposes, making sure we're always
willing to up to double the original timeout.

Bug: 258204427
Test: atest FrameworksMockingServicesTests:BroadcastRecordTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueModernImplTest
Change-Id: I8414630db0b7a7d6ea8df86931220ce6c5fc1671
parent 81d66e9d

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

+10 −7
Original line number Original line Diff line number Diff line
@@ -239,7 +239,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
            }

            }

            case MSG_DELIVERY_TIMEOUT_SOFT: {

            case MSG_DELIVERY_TIMEOUT_SOFT: {

                synchronized (mService) {

                synchronized (mService) {

                    deliveryTimeoutSoftLocked((BroadcastProcessQueue) msg.obj);

                    deliveryTimeoutSoftLocked((BroadcastProcessQueue) msg.obj, msg.arg1);

                }

                }

                return true;

                return true;

            }

            }
@@ -746,9 +746,10 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
        if (mService.mProcessesReady && !r.timeoutExempt && !assumeDelivered) {

        if (mService.mProcessesReady && !r.timeoutExempt && !assumeDelivered) {

            queue.lastCpuDelayTime = queue.app.getCpuDelayTime();

            queue.lastCpuDelayTime = queue.app.getCpuDelayTime();





            final long timeout = r.isForeground() ? mFgConstants.TIMEOUT : mBgConstants.TIMEOUT;

            final int softTimeoutMillis = (int) (r.isForeground() ? mFgConstants.TIMEOUT

            mLocalHandler.sendMessageDelayed(

                    : mBgConstants.TIMEOUT);

                    Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_SOFT, queue), timeout);

            mLocalHandler.sendMessageDelayed(Message.obtain(mLocalHandler,

                    MSG_DELIVERY_TIMEOUT_SOFT, softTimeoutMillis, 0, queue), softTimeoutMillis);

        }

        }





        if (r.allowBackgroundActivityStarts) {

        if (r.allowBackgroundActivityStarts) {
@@ -835,15 +836,17 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
        r.resultTo = null;

        r.resultTo = null;

    }

    }





    private void deliveryTimeoutSoftLocked(@NonNull BroadcastProcessQueue queue) {

    private void deliveryTimeoutSoftLocked(@NonNull BroadcastProcessQueue queue,

            int softTimeoutMillis) {

        if (queue.app != null) {

        if (queue.app != null) {

            // Instead of immediately triggering an ANR, extend the timeout by

            // Instead of immediately triggering an ANR, extend the timeout by

            // the amount of time the process was runnable-but-waiting; we're

            // the amount of time the process was runnable-but-waiting; we're

            // only willing to do this once before triggering an hard ANR

            // only willing to do this once before triggering an hard ANR

            final long cpuDelayTime = queue.app.getCpuDelayTime() - queue.lastCpuDelayTime;

            final long cpuDelayTime = queue.app.getCpuDelayTime() - queue.lastCpuDelayTime;

            final long timeout = MathUtils.constrain(cpuDelayTime, 0, mConstants.TIMEOUT);

            final long hardTimeoutMillis = MathUtils.constrain(cpuDelayTime, 0, softTimeoutMillis);

            mLocalHandler.sendMessageDelayed(

            mLocalHandler.sendMessageDelayed(

                    Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_HARD, queue), timeout);

                    Message.obtain(mLocalHandler, MSG_DELIVERY_TIMEOUT_HARD, queue),

                    hardTimeoutMillis);

        } else {

        } else {

            deliveryTimeoutHardLocked(queue);

            deliveryTimeoutHardLocked(queue);

        }

        }