diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-11-12 20:44:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-12 20:44:07 +0000 |
| commit | 88ffe1213110d46e7664d7957832ecbee00b7ee5 (patch) | |
| tree | d3f723ef65005076d238cf3f8e2b546632dc2121 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | d8f1f29b4ffb3bbbe37f4ea07324b6ce98519bda (diff) | |
| parent | 6979474cbe091f15ff6ae32754d35242675ca6ad (diff) | |
Merge "BluetoothAdapter: Extend getActiveDevice with LeAudio" am: a8c0faa120 am: c565a30366 am: a46cdf18fa am: 6979474cbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890537
Change-Id: Id4f689d756d9db31ae93d9a13f7bbe886fba2719
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index dac8ffe5e0..cf00cbd584 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -2022,6 +2022,7 @@ public final class BluetoothAdapter { * {@link BluetoothProfile#HEADSET}, * {@link BluetoothProfile#A2DP}, * {@link BluetoothProfile#HEARING_AID} + * {@link BluetoothProfile#LE_AUDIO} * @return A list of active bluetooth devices * @throws IllegalArgumentException If profile is not one of {@link ActiveDeviceProfile} * @hide @@ -2034,12 +2035,14 @@ public final class BluetoothAdapter { public @NonNull List<BluetoothDevice> getActiveDevices(@ActiveDeviceProfile int profile) { if (profile != BluetoothProfile.HEADSET && profile != BluetoothProfile.A2DP - && profile != BluetoothProfile.HEARING_AID) { + && profile != BluetoothProfile.HEARING_AID + && profile != BluetoothProfile.LE_AUDIO) { Log.e(TAG, "Invalid profile param value in getActiveDevices"); throw new IllegalArgumentException("Profiles must be one of " + "BluetoothProfile.A2DP, " + "BluetoothProfile.HEARING_AID, or" - + "BluetoothProfile.HEARING_AID"); + + "BluetoothProfile.HEARING_AID" + + "BluetoothProfile.LE_AUDIO"); } try { mServiceLock.readLock().lock(); |