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

Commit fd5bf4d0 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

BroadcastQueue: return reasons from skip policy. 

Adjust BroadcastSkipPolicy to return the skip "reason" as a String to
let callers control the logging, but don't wire up into
setDeliveryState() just yet, since there's still a lot of duplicated
information, and some scripts may be parsing the current raw format.

Bug: 254521331
Test: atest FrameworksMockingServicesTests:BroadcastRecordTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueModernImplTest
Change-Id: I1a74109e7188bd1e000639fc9924f538dceffc00
parent 0fb19e11

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

+115 −119

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, ResolveInfo info) {

            public boolean shouldSkip(BroadcastRecord r, Object o) {

                // Ignored

                return false;

            }

            public boolean shouldSkip(BroadcastRecord r, BroadcastFilter filter) {

            public String shouldSkipMessage(BroadcastRecord r, Object o) {

                // Ignored

                return false;

                return null;

            }

        };

        final BroadcastHistory emptyHistory = new BroadcastHistory(constants) {