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

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

Browse Source
This commit is contained in:
Matthew Xie
2013-10-21 22:58:53 +00:00
committed by Android (Google) Code Review
parent 8d51c2f6fa ac2c6c3a16
commit ce39e8ced8
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 * 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. * receive.
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @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 * 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; 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 * 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; 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. * the bonding process completes, and its result.
* <p>Android system services will handle the necessary user interactions * <p>Android system services will handle the necessary user interactions
* to confirm and complete the bonding process. * 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 * @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} * 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 * @return true pin has been set
* false for error * false for error
@@ -993,7 +993,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_PRIVILEGED}. * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
* *
* @return true confirmation has been sent out * @return true confirmation has been sent out
* false for error * false for error