summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Qasim Javed <qasimj@google.com> 2021-08-19 12:51:55 -0700
committer Qasim Javed <qasimj@google.com> 2021-09-16 22:38:47 +0000
commitd93483f74b4ec3bb94e53260f876c04526c78f3a (patch)
treecc7a5ce9aecbdfbf84284116b4da548f5106357a
parentb77efab6f36dad2331f97e8777ed04433f6cc751 (diff)
Make createBond(int) a system API
BUG: 195156317 Test: Manual Change-Id: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e Merged-In: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
-rw-r--r--core/api/system-current.txt1
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index af103ab460cf..e6015835c636 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1524,6 +1524,7 @@ package android.bluetooth {
public final class BluetoothDevice implements android.os.Parcelable {
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean cancelBondProcess();
+ method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean createBond(int);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean createBondOutOfBand(int, @Nullable android.bluetooth.OobData, @Nullable android.bluetooth.OobData);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean fetchUuidsWithSdp(int);
method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public byte[] getMetadata(int);
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 38fb90d9c4a7..6b98bbc6a251 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1326,7 +1326,7 @@ public final class BluetoothDevice implements Parcelable {
* @throws IllegalArgumentException if an invalid transport was specified
* @hide
*/
- @UnsupportedAppUsage
+ @SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
public boolean createBond(int transport) {
return createBondInternal(transport, null, null);