From c3cbf72f596c2af659905e06e85a5ac1241610a8 Mon Sep 17 00:00:00 2001 From: Edward Jee Date: Fri, 4 Oct 2013 18:01:55 -0700 Subject: [PATCH] Allows another GMS core app to handle ACTION_PAIRING_REQUEST . Now we use sendOrderedBroadcast for ACTION_PAIRING_REQUEST , and to receive this intent, BLUETOOTH_PRIVILEGED is required. Bug: 11087521 Change-Id: I6aa2fbc6538df39b24f141e7d75adc3658a7e7ac --- src/com/android/bluetooth/btservice/RemoteDevices.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java index a60f977e..643edc54 100755 --- a/src/com/android/bluetooth/btservice/RemoteDevices.java +++ b/src/com/android/bluetooth/btservice/RemoteDevices.java @@ -228,7 +228,7 @@ final class RemoteDevices { intent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pin); intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN); - mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM); + mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM); } void devicePropertyChangedCallback(byte[] address, int[] types, byte[][] values) { @@ -354,7 +354,7 @@ final class RemoteDevices { intent.putExtra(BluetoothDevice.EXTRA_DEVICE, getDevice(address)); intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.PAIRING_VARIANT_PIN); - mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM); + mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM); return; } @@ -379,7 +379,7 @@ final class RemoteDevices { variant = BluetoothDevice.PAIRING_VARIANT_PASSKEY; } else if (pairingVariant == AbstractionLayer.BT_SSP_VARIANT_PASSKEY_NOTIFICATION) { variant = BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY; - displayPasskey = true; + displayPasskey = true; } else { errorLog("SSP Pairing variant not present"); return; @@ -396,7 +396,7 @@ final class RemoteDevices { intent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, passkey); } intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, variant); - mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM); + mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM); } void aclStateChangeCallback(int status, byte[] address, int newState) { -- 2.11.0