drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

Browse Source 
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
This commit is contained in:
Matthew Xie
2013-10-21 16:05:26 -07:00
committed by Android Git Automerger
parent 3e33d5a769 ce39e8ced8
commit 9a53fbe44f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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