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

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-21 00:12:03 +00:00
committed by Android (Google) Code Review
parent 29e4cd66d7 93326cfd9f
commit 22046e7323
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

@@ -1153,12 +1153,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");