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

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b

Browse Source 
am: 5742a055e2

Change-Id: If850d33567371bc2a9bd4e2394b90ea84066b602
This commit is contained in:
Marie Janssen
2016-09-21 02:24:18 +00:00
committed by android-build-merger
parent 85973e91d2 5742a055e2
commit bf11fae04e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1167,12 +1167,12 @@ public final class BluetoothDevice implements Parcelable {
/** /**
* Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing. * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.
* *
* @return true confirmation has been sent out * @return true confirmation has been sent out
* false for error * false for error
*/ */
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setPairingConfirmation(boolean confirm) { public boolean setPairingConfirmation(boolean confirm) {
if (sService == null) { if (sService == null) {
Log.e(TAG, "BT not enabled. Cannot set pairing confirmation"); Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");