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

Commit 2c4a67fe authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Add a new test to verify delivery group policy." into udc-dev am: 015186f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22317132



Change-Id: If9c04cb912e2899213a49d37d87c839ca6b09667
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7e40faa 015186f2

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

+36 −0
Original line number Diff line number Diff line
@@ -1008,6 +1008,42 @@ public final class BroadcastQueueModernImplTest { 
                dropboxEntryBroadcast2.first, expectedMergedBroadcast.first));

    }



    @Test

    public void testDeliveryGroupPolicy_sameAction_differentMatchingCriteria() {

        final Intent closeSystemDialogs1 = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        final BroadcastOptions optionsCloseSystemDialog1 = BroadcastOptions.makeBasic()

                .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT);



        final Intent closeSystemDialogs2 = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)

                .putExtra("reason", "testing");

        final BroadcastOptions optionsCloseSystemDialog2 = BroadcastOptions.makeBasic()

                .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)

                .setDeliveryGroupMatchingKey(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, "testing");



        // Halt all processing so that we get a consistent view

        mHandlerThread.getLooper().getQueue().postSyncBarrier();



        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs1, optionsCloseSystemDialog1));

        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs2, optionsCloseSystemDialog2));

        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs1, optionsCloseSystemDialog1));

        // Verify that only the older broadcast with no extras was removed.

        final BroadcastProcessQueue queue = mImpl.getProcessQueue(PACKAGE_GREEN,

                getUidForPackage(PACKAGE_GREEN));

        verifyPendingRecords(queue, List.of(closeSystemDialogs2, closeSystemDialogs1));



        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs2, optionsCloseSystemDialog2));

        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs1, optionsCloseSystemDialog1));

        mImpl.enqueueBroadcastLocked(makeBroadcastRecord(

                closeSystemDialogs2, optionsCloseSystemDialog2));

        // Verify that only the older broadcast with no extras was removed.

        verifyPendingRecords(queue, List.of(closeSystemDialogs1, closeSystemDialogs2));

    }



    private Pair<Intent, BroadcastOptions> createDropboxBroadcast(String tag, long timestampMs,

            int droppedCount) {

        final Intent dropboxEntryAdded = new Intent(DropBoxManager.ACTION_DROPBOX_ENTRY_ADDED);