Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a46cdf18 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BluetoothAdapter: Extend getActiveDevice with LeAudio" am: a8c0faa120 am: c565a303 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890537

Change-Id: I9fdce99506ef1fcc53ffc0afcfd23f57420e9c35
parents d4dc9fe4 c565a303

framework/java/android/bluetooth/BluetoothAdapter.java

+5 −2
Original line number Diff line number Diff line
@@ -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();