Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass Uri in SliceBroadcastRelay" into pi-dev

Browse Source 
am: cb20eb3a07

Change-Id: I4e4b345fdf060d631a9d7e18fad1c28adcad3378
This commit is contained in:
Matthew Fritze
2018-05-11 15:22:49 -07:00
committed by android-build-merger
parent 5331f1982e cb20eb3a07
commit 3aa0ea25da
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/SliceBroadcastRelayHandler.java
View File

@@ -87,9 +87,11 @@ public class SliceBroadcastRelayHandler extends SystemUI {
private final ArraySet<ComponentName> mReceivers = new ArraySet<>(); private final ArraySet<ComponentName> mReceivers = new ArraySet<>();
private final UserHandle mUserId; private final UserHandle mUserId;
private final Uri mUri;
public BroadcastRelay(Uri uri) { public BroadcastRelay(Uri uri) {
mUserId = new UserHandle(ContentProvider.getUserIdFromUri(uri)); mUserId = new UserHandle(ContentProvider.getUserIdFromUri(uri));
mUri = uri;
} }
public void register(Context context, ComponentName receiver, IntentFilter filter) { public void register(Context context, ComponentName receiver, IntentFilter filter) {
@@ -106,6 +108,7 @@ public class SliceBroadcastRelayHandler extends SystemUI {
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
for (ComponentName receiver : mReceivers) { for (ComponentName receiver : mReceivers) {
intent.setComponent(receiver); intent.setComponent(receiver);
intent.putExtra(SliceBroadcastRelay.EXTRA_URI, mUri.toString());
if (DEBUG) Log.d(TAG, "Forwarding " + receiver + " " + intent + " " + mUserId); if (DEBUG) Log.d(TAG, "Forwarding " + receiver + " " + intent + " " + mUserId);
context.sendBroadcastAsUser(intent, mUserId); context.sendBroadcastAsUser(intent, mUserId);
} }

1
packages/SystemUI/tests/src/com/android/systemui/SliceBroadcastRelayHandlerTest.java
View File

@@ -60,6 +60,7 @@ public class SliceBroadcastRelayHandlerTest extends SysuiTestCase {
new ComponentName(mContext.getPackageName(), Receiver.class.getName())); new ComponentName(mContext.getPackageName(), Receiver.class.getName()));
IntentFilter value = new IntentFilter(TEST_ACTION); IntentFilter value = new IntentFilter(TEST_ACTION);
intent.putExtra(SliceBroadcastRelay.EXTRA_FILTER, value); intent.putExtra(SliceBroadcastRelay.EXTRA_FILTER, value);
intent.putExtra(SliceBroadcastRelay.EXTRA_URI, testUri);
relayHandler.handleIntent(intent); relayHandler.handleIntent(intent);
verify(relayHandler.mContext).registerReceiver(any(), eq(value)); verify(relayHandler.mContext).registerReceiver(any(), eq(value));