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

Commit 46a36cb0 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Revert "BroadcastQueue: skip ANRs when assuming success." 

Revert submission 20329504

Reason for revert: Broken SystemServicesTestRuleTest
Bug: 256741859 
Reverted Changes:
I1a74109e7:BroadcastQueue: return reasons from skip policy.
I7fe33cd17:BroadcastQueue: better state transition logging.
I9899e805f:BroadcastQueue: skip ANRs when assuming success.

Change-Id: I13e432a0928d919476c1d644c8c2ad5ed6943805
parent ccb17e4d

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

+2 −5
Original line number Diff line number Diff line
@@ -736,10 +736,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
            return;

        }



        // Skip ANR tracking early during boot, when requested, or when we

        // immediately assume delivery success

        final boolean assumeDelivered = (receiver instanceof BroadcastFilter) && !r.ordered;

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

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

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



            final long timeout = r.isForeground() ? mFgConstants.TIMEOUT : mBgConstants.TIMEOUT;
@@ -782,7 +779,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 


                    // TODO: consider making registered receivers of unordered

                    // broadcasts report results to detect ANRs

                    if (assumeDelivered) {

                    if (!r.ordered) {

                        finishReceiverLocked(queue, BroadcastRecord.DELIVERY_DELIVERED,

                                "assuming delivered");

                    }