diff options
| author | Matthew Xie <mattx@google.com> | 2013-10-21 16:11:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 16:11:07 -0700 |
| commit | c1108cbaa77d56205db424915c00636f04cbb83e (patch) | |
| tree | cf493fa47254983da8dea5caab7db1211cbe0619 /framework/java/android/bluetooth/BluetoothDevice.java | |
| parent | 0461471825d942147c0c0cbce02d0867b1f1a10e (diff) | |
| parent | 9927a756ebba0b458b1d2d433ca7f94fdc87bc97 (diff) | |
am 46cfa691: am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit '46cfa691379af957cabecac83ae909ba83f93a8f':
Change pairing api/intent permission from PRIVILEGED to ADMIN
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 5822e468b3..d789a944f5 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -322,7 +322,7 @@ public final class BluetoothDevice implements Parcelable { /** * Broadcast Action: This intent is used to broadcast PAIRING REQUEST - * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED} to + * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} to * receive. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @@ -465,7 +465,7 @@ public final class BluetoothDevice implements Parcelable { /** * The user will be prompted to enter a pin or - * a privileged app will enter a pin for user. + * an app will enter a pin for user. */ public static final int PAIRING_VARIANT_PIN = 0; @@ -477,7 +477,7 @@ public final class BluetoothDevice implements Parcelable { /** * The user will be prompted to confirm the passkey displayed on the screen or - * a privileged app will confirm the passkey for the user. + * an app will confirm the passkey for the user. */ public static final int PAIRING_VARIANT_PASSKEY_CONFIRMATION = 2; @@ -725,7 +725,7 @@ public final class BluetoothDevice implements Parcelable { * the bonding process completes, and its result. * <p>Android system services will handle the necessary user interactions * to confirm and complete the bonding process. - * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. * * @return false on immediate error, true if bonding will begin */ @@ -965,7 +965,7 @@ public final class BluetoothDevice implements Parcelable { /** * Set the pin during pairing when the pairing method is {@link #PAIRING_VARIANT_PIN} - * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. * * @return true pin has been set * false for error @@ -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_PRIVILEGED}. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. * * @return true confirmation has been sent out * false for error |