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

Commit 8cae5813 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Remove references to legacy queue." into main

parents 18e7428e 7b916449

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

+2 −8
Original line number Diff line number Diff line
@@ -940,8 +940,7 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 


        final ProcessRecord receiverGreenApp = mAms.getProcessRecordLocked(PACKAGE_GREEN,

                getUidForPackage(PACKAGE_GREEN));

        // Modern queue always kills the target process when broadcast delivery fails, where as

        // the legacy queue leaves the process killing task to AMS

        // Broadcast queue always kills the target process when broadcast delivery fails.

        assertNull(receiverGreenApp);

        final ProcessRecord receiverBlueApp = mAms.getProcessRecordLocked(PACKAGE_BLUE,

                getUidForPackage(PACKAGE_BLUE));
@@ -1054,8 +1053,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
        }



        waitForIdle();

        // Legacy stack does not remove registered receivers as part of

        // cleanUpDisabledPackageReceiversLocked() call, so verify this only on modern queue.

        verifyScheduleReceiver(never(), callerApp, USER_GUEST);

        verifyScheduleRegisteredReceiver(never(), callerApp, USER_GUEST);

        for (String pkg : new String[] {
@@ -1166,8 +1163,7 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
        final ProcessRecord receiverOrangeApp = mAms.getProcessRecordLocked(PACKAGE_ORANGE,

                getUidForPackage(PACKAGE_ORANGE));



        // Modern queue always kills the target process when broadcast delivery fails, where as

        // the legacy queue leaves the process killing task to AMS

        // Broadcast queue always kills the target process when broadcast delivery fails.

        assertNull(receiverGreenApp);

        verifyScheduleRegisteredReceiver(times(1), receiverBlueApp, airplane);

        verifyScheduleReceiver(times(1), receiverYellowApp, airplane);
@@ -1210,8 +1206,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { 
        final ProcessRecord restartedReceiverBlueApp = mAms.getProcessRecordLocked(PACKAGE_BLUE,

                getUidForPackage(PACKAGE_BLUE));

        assertNotEquals(receiverBlueApp, restartedReceiverBlueApp);

        // Legacy queue will always try delivering the broadcast even if the process

        // has been killed.

        verifyScheduleReceiver(never(), receiverBlueApp, airplane);

        // Verify that the new process receives the broadcast.

        verifyScheduleReceiver(times(1), restartedReceiverBlueApp, airplane);