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

Commit 6d8daf68 authored by Michał Brzeziński's avatar Michał Brzeziński
Browse files

Revert "BroadcastQueue: return reasons from skip policy." 

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: Ia7601026df1997bcde8f7392b5bdbb6e06e2253b
parent 8ef5a2e3

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

+119 −115

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java

+3 −3
Original line number Diff line number Diff line
@@ -280,13 +280,13 @@ public class BroadcastQueueTest { 
        constants.TIMEOUT = 100;

        constants.ALLOW_BG_ACTIVITY_START_TIMEOUT = 0;

        final BroadcastSkipPolicy emptySkipPolicy = new BroadcastSkipPolicy(mAms) {

            public boolean shouldSkip(BroadcastRecord r, Object o) {

            public boolean shouldSkip(BroadcastRecord r, ResolveInfo info) {

                // Ignored

                return false;

            }

            public String shouldSkipMessage(BroadcastRecord r, Object o) {

            public boolean shouldSkip(BroadcastRecord r, BroadcastFilter filter) {

                // Ignored

                return null;

                return false;

            }

        };

        final BroadcastHistory emptyHistory = new BroadcastHistory(constants) {