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

Commit 81be8279 authored by Iván Budnik's avatar Iván Budnik
Browse files

Non-functionally refactor createBluetoothRoute 

This change also allows us to obtain bluetooth route details without
having to build the MediaRoute2Info itself.

Test: N/A
Bug: 305199571
Change-Id: I389044d2f5d9660635895ef1396a60cc8c77a5e4
parent 91147a2c

services/core/java/com/android/server/media/BluetoothDeviceRoutesManager.java

+45 −21
Original line number Diff line number Diff line
@@ -134,10 +134,8 @@ import java.util.stream.Collectors; 
    @Nullable

    public synchronized String getRouteIdForBluetoothAddress(@Nullable String address) {

        BluetoothDevice bluetoothDevice = mAddressToBondedDevice.get(address);

        // TODO: b/305199571 - Optimize the following statement to avoid creating the full

        // MediaRoute2Info instance. We just need the id.

        return bluetoothDevice != null

                ? createBluetoothRoute(bluetoothDevice).mRoute.getId()

                ? getRouteIdForType(bluetoothDevice, getDeviceType(bluetoothDevice))

                : null;

    }
@@ -227,25 +225,10 @@ import java.util.stream.Collectors; 
        newBtRoute.mBtDevice = device;

        String deviceName = getDeviceName(device);



        String routeId = device.getAddress();

        int type = MediaRoute2Info.TYPE_BLUETOOTH_A2DP;

        newBtRoute.mConnectedProfiles = new SparseBooleanArray();

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.A2DP, device)) {

            newBtRoute.mConnectedProfiles.put(BluetoothProfile.A2DP, true);

        }

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.HEARING_AID, device)) {

            newBtRoute.mConnectedProfiles.put(BluetoothProfile.HEARING_AID, true);

            routeId = HEARING_AID_ROUTE_ID_PREFIX

                    + mBluetoothProfileMonitor.getGroupId(BluetoothProfile.HEARING_AID, device);

            type = MediaRoute2Info.TYPE_HEARING_AID;

        }

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.LE_AUDIO, device)) {

            newBtRoute.mConnectedProfiles.put(BluetoothProfile.LE_AUDIO, true);

            routeId = LE_AUDIO_ROUTE_ID_PREFIX

                    + mBluetoothProfileMonitor.getGroupId(BluetoothProfile.LE_AUDIO, device);

            type = MediaRoute2Info.TYPE_BLE_HEADSET;

        }

        int type = getDeviceType(device);

        String routeId = getRouteIdForType(device, type);



        newBtRoute.mConnectedProfiles = getConnectedProfiles(device);

        // Note that volume is only relevant for active bluetooth routes, and those are managed via

        // AudioManager.

        newBtRoute.mRoute =
@@ -273,6 +256,47 @@ import java.util.stream.Collectors; 
        }

        return deviceName;

    }

    private SparseBooleanArray getConnectedProfiles(@NonNull BluetoothDevice device) {

        SparseBooleanArray connectedProfiles = new SparseBooleanArray();

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.A2DP, device)) {

            connectedProfiles.put(BluetoothProfile.A2DP, true);

        }

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.HEARING_AID, device)) {

            connectedProfiles.put(BluetoothProfile.HEARING_AID, true);

        }

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.LE_AUDIO, device)) {

            connectedProfiles.put(BluetoothProfile.LE_AUDIO, true);

        }



        return connectedProfiles;

    }



    private int getDeviceType(@NonNull BluetoothDevice device) {

        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.LE_AUDIO, device)) {

            return MediaRoute2Info.TYPE_BLE_HEADSET;

        }



        if (mBluetoothProfileMonitor.isProfileSupported(BluetoothProfile.HEARING_AID, device)) {

            return MediaRoute2Info.TYPE_HEARING_AID;

        }



        return MediaRoute2Info.TYPE_BLUETOOTH_A2DP;

    }



    private String getRouteIdForType(@NonNull BluetoothDevice device, int type) {

        return switch (type) {

            case (MediaRoute2Info.TYPE_BLE_HEADSET) ->

                    LE_AUDIO_ROUTE_ID_PREFIX

                            + mBluetoothProfileMonitor.getGroupId(

                                    BluetoothProfile.LE_AUDIO, device);

            case (MediaRoute2Info.TYPE_HEARING_AID) ->

                    HEARING_AID_ROUTE_ID_PREFIX

                            + mBluetoothProfileMonitor.getGroupId(

                                    BluetoothProfile.HEARING_AID, device);

            // TYPE_BLUETOOTH_A2DP

            default -> device.getAddress();

        };

    }



    private static class BluetoothRouteInfo {

        private BluetoothDevice mBtDevice;