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

Commit 7c698c7a authored by Michael Groover's avatar Michael Groover
Browse files

Revert "Revert "Add unaudited exported flag to exposed runtime receivers"" 

This reverts commit 9041b19e.

Reason for revert: Failing tests have been resolved, reverting to
restore the other flagged receivers from the original CL.

This commit also marks the BubbleController's receiver as exported
since the ACTION_CLOSE_SYSTEM_DIALOGS broadcast can only be sent
by tests on T+ devices.

Bug: 234659204
Test: atest SystemUITests:com.android.systemui.statusbar.policy.SafetyControllerTest
Test: atest SystemUITests:com.android.systemui.wmshell.BubblesTest
Change-Id: Id6370750cab69d49e001f783051e4248201639e4
parent 983769ff

core/tests/coretests/src/android/app/activity/LocalReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ public class LocalReceiver extends BroadcastReceiver { 
        if (BroadcastTest.BROADCAST_FAIL_REGISTER.equals(intent.getAction())) {

            resultString = "Successfully registered, but expected it to fail";

            try {

                context.registerReceiver(this, new IntentFilter("foo.bar"));

                context.registerReceiver(this, new IntentFilter("foo.bar"),

                        Context.RECEIVER_EXPORTED_UNAUDITED);

                context.unregisterReceiver(this);

            } catch (ReceiverCallNotAllowedException e) {

                //resultString = "This is the correct behavior but not yet implemented";

core/tests/coretests/src/android/app/activity/ServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class ServiceTest extends TestCase { 
                pidResult.complete(intent.getIntExtra(EXTRA_PID, NOT_STARTED));

                mContext.unregisterReceiver(this);

            }

        }, new IntentFilter(ACTION_SERVICE_STARTED));

        }, new IntentFilter(ACTION_SERVICE_STARTED), Context.RECEIVER_EXPORTED_UNAUDITED);



        serviceTrigger.run();

        try {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ public class BubbleController implements ConfigurationChangeListener { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        filter.addAction(Intent.ACTION_SCREEN_OFF);

        mContext.registerReceiver(mBroadcastReceiver, filter);

        mContext.registerReceiver(mBroadcastReceiver, filter, Context.RECEIVER_EXPORTED);

    }



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

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

+4 −4
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ public class BubblesTest extends SysuiTestCase { 
        spyOn(mContext);

        mBubbleController.updateBubble(mBubbleEntry);

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

                mFilterArgumentCaptor.capture());

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

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

                Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        assertThat(mFilterArgumentCaptor.getValue().getAction(1)).isEqualTo(
@@ -1349,7 +1349,7 @@ public class BubblesTest extends SysuiTestCase { 
        mBubbleController.updateBubble(mBubbleEntry);

        mBubbleData.setExpanded(true);

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

                mFilterArgumentCaptor.capture());

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

        Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i);
@@ -1363,7 +1363,7 @@ public class BubblesTest extends SysuiTestCase { 
        mBubbleData.setExpanded(true);



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

                mFilterArgumentCaptor.capture());

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

        Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        i.putExtra("reason", "gestureNav");

        mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i);
@@ -1377,7 +1377,7 @@ public class BubblesTest extends SysuiTestCase { 
        mBubbleData.setExpanded(true);



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

                mFilterArgumentCaptor.capture());

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



        Intent i = new Intent(Intent.ACTION_SCREEN_OFF);

        mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i);