am 5ea3689e: am 208c42df: Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-dev

* commit '5ea3689ea69f3c934a3c95b9ba82a41e073123d2':
  Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.
This commit is contained in:
Edward Jee
2013-10-10 13:15:34 -07:00
committed by Android Git Automerger

View File

@@ -322,7 +322,8 @@ public final class BluetoothDevice implements Parcelable {
/**
* Broadcast Action: This intent is used to broadcast PAIRING REQUEST
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED} to
* receive.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_PAIRING_REQUEST =