diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2022-03-17 10:59:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-17 10:59:16 +0000 |
| commit | 411e45b8ed9d09391e66720a7ea844bcef45a8cb (patch) | |
| tree | 36b5dff8543062ed3a39d66895bdd4b9f5c94e46 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 216b0daa3459c2257aa59cd682d1a395171da309 (diff) | |
| parent | 0593fda6e74959a53b7a5ff77fa412a020b03919 (diff) | |
Merge "[API Review] Add new GetUuidsList method" am: 0bf8d23c0f am: 0593fda6e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2020197
Change-Id: I41e6e16b4b8d63c674f8b21de3bdd7ac9372abb7
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index c5d550aed7..716d808a11 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1440,11 +1440,10 @@ public final class BluetoothAdapter { * @return the UUIDs supported by the local Bluetooth Adapter. * @hide */ - @SystemApi + @UnsupportedAppUsage @RequiresLegacyBluetoothPermission @RequiresBluetoothConnectPermission @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) - @SuppressLint(value = {"ArrayReturn", "NullableCollection"}) public @NonNull ParcelUuid[] getUuids() { if (getState() != STATE_ON) { return new ParcelUuid[0]; @@ -1468,6 +1467,18 @@ public final class BluetoothAdapter { } /** + * Get the UUIDs supported by the local Bluetooth adapter. + * + * @return a list of the UUIDs supported by the local Bluetooth Adapter. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) + public @NonNull List<ParcelUuid> getUuidsList() { + return Arrays.asList(getUuids()); + } + + /** * Set the friendly Bluetooth name of the local Bluetooth adapter. * <p>This name is visible to remote Bluetooth devices. * <p>Valid Bluetooth names are a maximum of 248 bytes using UTF-8 |