summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Chang <georgekgchang@google.com>2020-08-04 15:06:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-04 15:06:43 +0000
commit5781f75daba629d176b85a74a41076f561cc399e (patch)
tree09a75a4e28f040e462077a99a091b1918512a3f4
parentc945f93b664005448e9098d7e5927dfd67a7c416 (diff)
parent5700c012b29a3220a4a29e761e9c55866c778057 (diff)
downloadNfc-5781f75daba629d176b85a74a41076f561cc399e.tar.gz
Protect Bluetooth device information when using NFC pairing am: 5700c012b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I3e9b0368e4adf7c4dc79b2f65e0d55a36dcf7a83
-rw-r--r--src/com/android/nfc/handover/ConfirmConnectActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/nfc/handover/ConfirmConnectActivity.java b/src/com/android/nfc/handover/ConfirmConnectActivity.java
index 75310e17..c87fc36c 100644
--- a/src/com/android/nfc/handover/ConfirmConnectActivity.java
+++ b/src/com/android/nfc/handover/ConfirmConnectActivity.java
@@ -50,6 +50,7 @@ public class ConfirmConnectActivity extends Activity {
public void onClick(DialogInterface dialog, int id) {
Intent allowIntent = new Intent(BluetoothPeripheralHandover.ACTION_ALLOW_CONNECT);
allowIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+ allowIntent.setPackage("com.android.nfc");
sendBroadcast(allowIntent);
ConfirmConnectActivity.this.mAlert = null;
ConfirmConnectActivity.this.finish();
@@ -60,6 +61,7 @@ public class ConfirmConnectActivity extends Activity {
public void onClick(DialogInterface dialog, int id) {
Intent denyIntent = new Intent(BluetoothPeripheralHandover.ACTION_DENY_CONNECT);
denyIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+ denyIntent.setPackage("com.android.nfc");
sendBroadcast(denyIntent);
ConfirmConnectActivity.this.mAlert = null;
ConfirmConnectActivity.this.finish();
@@ -79,6 +81,7 @@ public class ConfirmConnectActivity extends Activity {
mAlert.dismiss();
Intent denyIntent = new Intent(BluetoothPeripheralHandover.ACTION_DENY_CONNECT);
denyIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+ denyIntent.setPackage("com.android.nfc");
sendBroadcast(denyIntent);
mAlert = null;
}