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

Merge "Add IntDef to BluetoothAdapter IO_CAP constants" am: c1fd61b302

Browse Source 
am: 84384d5980

Change-Id: I1cebcaec37e2bc5efcffa4035f83b0cac068630a
This commit is contained in:
Pulkit Bhuwalka
2018-08-21 03:17:48 -07:00
committed by android-build-merger
parent 6b8d5414e0 84384d5980
commit 44dfe29e61
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,6 +446,12 @@ public final class BluetoothAdapter {
*/
public static final int IO_CAPABILITY_UNKNOWN = 255;
/** @hide */
@IntDef({IO_CAPABILITY_OUT, IO_CAPABILITY_IO, IO_CAPABILITY_IN, IO_CAPABILITY_NONE,
IO_CAPABILITY_KBDISP})
@Retention(RetentionPolicy.SOURCE)
public @interface IoCapability {}
/**
* Broadcast Action: The local Bluetooth adapter has started the remote
* device discovery process.
@@ -1292,6 +1298,7 @@ public final class BluetoothAdapter {
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
@IoCapability
public int getIoCapability() {
if (getState() != STATE_ON) return BluetoothAdapter.IO_CAPABILITY_UNKNOWN;
try {
@@ -1319,7 +1326,7 @@ public final class BluetoothAdapter {
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setIoCapability(int capability) {
public boolean setIoCapability(@IoCapability int capability) {
if (getState() != STATE_ON) return false;
try {
mServiceLock.readLock().lock();
@@ -1342,6 +1349,7 @@ public final class BluetoothAdapter {
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
@IoCapability
public int getLeIoCapability() {
if (getState() != STATE_ON) return BluetoothAdapter.IO_CAPABILITY_UNKNOWN;
try {
@@ -1369,7 +1377,7 @@ public final class BluetoothAdapter {
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setLeIoCapability(int capability) {
public boolean setLeIoCapability(@IoCapability int capability) {
if (getState() != STATE_ON) return false;
try {
mServiceLock.readLock().lock();