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

Commit 98d02e71 authored by Mady Mellor's avatar Mady Mellor
Browse files

Handle inconsistent ordering of intent filter arguments 

Ensure both filter actions are found but assume any order.

Test: treehugger
Bug: 262574315
Change-Id: I248f5dd70683b36109b35f511067c42a44b24120
parent e0401be5

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+4 −4
Original line number Diff line number Diff line
@@ -1332,10 +1332,10 @@ public class BubblesTest extends SysuiTestCase { 
        mBubbleController.updateBubble(mBubbleEntry);

        verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(),

                mFilterArgumentCaptor.capture(), eq(Context.RECEIVER_EXPORTED));

        assertThat(mFilterArgumentCaptor.getValue().getAction(0)).isEqualTo(

                Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        assertThat(mFilterArgumentCaptor.getValue().getAction(1)).isEqualTo(

                Intent.ACTION_SCREEN_OFF);

        assertThat(mFilterArgumentCaptor.getValue()

                .hasAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)).isTrue();

        assertThat(mFilterArgumentCaptor.getValue()

                .hasAction(Intent.ACTION_SCREEN_OFF)).isTrue();



        mBubbleData.dismissBubbleWithKey(mBubbleEntry.getKey(), REASON_APP_CANCEL);

        // TODO: not certain why this isn't called normally when tests are run, perhaps because