diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-02-13 16:37:37 -0800 |
|---|---|---|
| committer | Marie Janssen <jamuraa@google.com> | 2017-02-13 16:37:37 -0800 |
| commit | 6fdfbc833045785f2dfd6f7b25c4a9a7e620748d (patch) | |
| tree | cfce74cd234ca03f659d29552e9e55943309d792 | |
| parent | 4dcbd4d478abbc1aea4d2e273673ae252848316c (diff) | |
| download | platform_packages_apps_Nfc-6fdfbc833045785f2dfd6f7b25c4a9a7e620748d.tar.gz platform_packages_apps_Nfc-6fdfbc833045785f2dfd6f7b25c4a9a7e620748d.tar.bz2 platform_packages_apps_Nfc-6fdfbc833045785f2dfd6f7b25c4a9a7e620748d.zip | |
Beam: aim intents directly to com.android.bluetooth
Intents should be aimed directly at the package which needs to launch
the receiver for them.
Test: receive a beam from another phone
Change-Id: I0de2a926906fb4bf6e721252afe8e04c810a4e08
| -rw-r--r-- | src/com/android/nfc/beam/BeamManager.java | 2 | ||||
| -rw-r--r-- | src/com/android/nfc/beam/BeamTransferManager.java | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java index 87ea8813..8cd3dfc6 100644 --- a/src/com/android/nfc/beam/BeamManager.java +++ b/src/com/android/nfc/beam/BeamManager.java @@ -37,6 +37,7 @@ public class BeamManager implements Handler.Callback { private static final String TAG = "BeamManager"; private static final boolean DBG = false; + private static final String BLUETOOTH_PACKAGE = "com.android.bluetooth"; private static final String ACTION_WHITELIST_DEVICE = "android.btopp.intent.action.WHITELIST_DEVICE"; public static final int MSG_BEAM_COMPLETE = 0; @@ -135,6 +136,7 @@ public class BeamManager implements Handler.Callback { void whitelistOppDevice(Context context, BluetoothDevice device) { if (DBG) Log.d(TAG, "Whitelisting " + device + " for BT OPP"); Intent intent = new Intent(ACTION_WHITELIST_DEVICE); + intent.setPackage(BLUETOOTH_PACKAGE); intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device); context.sendBroadcastAsUser(intent, UserHandle.CURRENT); } diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java index 0dafd956..8f73aa24 100644 --- a/src/com/android/nfc/beam/BeamTransferManager.java +++ b/src/com/android/nfc/beam/BeamTransferManager.java @@ -102,6 +102,8 @@ public class BeamTransferManager implements Handler.Callback, static final String BEAM_DIR = "beam"; + static final String BLUETOOTH_PACKAGE = "com.android.bluetooth"; + static final String ACTION_WHITELIST_DEVICE = "android.btopp.intent.action.WHITELIST_DEVICE"; @@ -176,6 +178,7 @@ public class BeamTransferManager implements Handler.Callback, void whitelistOppDevice(BluetoothDevice device) { if (DBG) Log.d(TAG, "Whitelisting " + device + " for BT OPP"); Intent intent = new Intent(ACTION_WHITELIST_DEVICE); + intent.setPackage(BLUETOOTH_PACKAGE); intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device); mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT); } @@ -285,6 +288,7 @@ public class BeamTransferManager implements Handler.Callback, private void sendBluetoothCancelIntentAndUpdateState() { Intent cancelIntent = new Intent(ACTION_STOP_BLUETOOTH_TRANSFER); + cancelIntent.setPackage(BLUETOOTH_PACKAGE); cancelIntent.putExtra(BeamStatusReceiver.EXTRA_TRANSFER_ID, mBluetoothTransferId); mContext.sendBroadcast(cancelIntent); updateStateAndNotification(STATE_CANCELLED); |