Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev

This commit is contained in:
TreeHugger Robot
2016-09-21 00:07:34 +00:00
committed by Android (Google) Code Review

View File

@@ -1074,7 +1074,7 @@ 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