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

Commit 3aa0ea25 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Pass Uri in SliceBroadcastRelay" into pi-dev 

am: cb20eb3a

Change-Id: I4e4b345fdf060d631a9d7e18fad1c28adcad3378
parents 5331f198 cb20eb3a

packages/SystemUI/src/com/android/systemui/SliceBroadcastRelayHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ public class SliceBroadcastRelayHandler extends SystemUI { 


        private final ArraySet<ComponentName> mReceivers = new ArraySet<>();

        private final UserHandle mUserId;

        private final Uri mUri;



        public BroadcastRelay(Uri uri) {

            mUserId = new UserHandle(ContentProvider.getUserIdFromUri(uri));

            mUri = uri;

        }



        public void register(Context context, ComponentName receiver, IntentFilter filter) {
@@ -106,6 +108,7 @@ public class SliceBroadcastRelayHandler extends SystemUI { 
            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            for (ComponentName receiver : mReceivers) {

                intent.setComponent(receiver);

                intent.putExtra(SliceBroadcastRelay.EXTRA_URI, mUri.toString());

                if (DEBUG) Log.d(TAG, "Forwarding " + receiver + " " + intent + " " + mUserId);

                context.sendBroadcastAsUser(intent, mUserId);

            }

packages/SystemUI/tests/src/com/android/systemui/SliceBroadcastRelayHandlerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class SliceBroadcastRelayHandlerTest extends SysuiTestCase { 
                new ComponentName(mContext.getPackageName(), Receiver.class.getName()));

        IntentFilter value = new IntentFilter(TEST_ACTION);

        intent.putExtra(SliceBroadcastRelay.EXTRA_FILTER, value);

        intent.putExtra(SliceBroadcastRelay.EXTRA_URI, testUri);



        relayHandler.handleIntent(intent);

        verify(relayHandler.mContext).registerReceiver(any(), eq(value));