diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-09-20 23:44:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-20 23:45:00 +0000 |
| commit | 204da8aa9e190f9409ec5dd56fd88e4c526b202a (patch) | |
| tree | c32fd60880ffa9cbeb2ac510f136c7b7116e7355 /core/java/android | |
| parent | d1e3e53d7912c16a5b3556d7898079ad7435563c (diff) | |
| parent | edae39d59aa2155c2d79cca991e163e2284cc355 (diff) | |
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index d789a944f5f2..cd74faa4e92c 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -993,7 +993,7 @@ public final class BluetoothDevice implements Parcelable { /** * 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 * false for error |