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

Commit 9c9876e6 authored by Grace Jia's avatar Grace Jia
Browse files

Update BT device properly in BluetoothDeviceManager when device with 

same address changed to other type.

Bug: 236234298
Test: atest BluetoothDeviceManagerTest
Change-Id: I6dbbc129ed24d021bd590a54daf45cb68c917b20
parent f1de127d

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+16 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.media.audio.common.AudioDevice; 
import android.telecom.Log;

import android.util.LocalLog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;



import java.util.ArrayList;
@@ -174,6 +175,12 @@ public class BluetoothDeviceManager { 
            new LinkedHashMap<>();

    private final LinkedHashMap<BluetoothDevice, Integer> mGroupsByDevice =

            new LinkedHashMap<>();

    private final ArrayList<LinkedHashMap<String, BluetoothDevice>>

            mDevicesByAddressMaps = new ArrayList<LinkedHashMap<String, BluetoothDevice>>(); {

        mDevicesByAddressMaps.add(mHfpDevicesByAddress);

        mDevicesByAddressMaps.add(mHearingAidDevicesByAddress);

        mDevicesByAddressMaps.add(mLeAudioDevicesByAddress);

    }

    private int mGroupIdActive = BluetoothLeAudio.GROUP_ID_INVALID;

    private int mGroupIdPending = BluetoothLeAudio.GROUP_ID_INVALID;

    private final LocalLog mLocalLog = new LocalLog(20);
@@ -329,8 +336,10 @@ public class BluetoothDeviceManager { 
        }

    }



    void onDeviceConnected(BluetoothDevice device, int deviceType) {

    @VisibleForTesting

    public void onDeviceConnected(BluetoothDevice device, int deviceType) {

        synchronized (mLock) {

            clearDeviceFromDeviceMaps(device.getAddress());

            LinkedHashMap<String, BluetoothDevice> targetDeviceMap;

            if (deviceType == DEVICE_TYPE_LE_AUDIO) {

                if (mBluetoothLeAudioService == null) {
@@ -372,6 +381,12 @@ public class BluetoothDeviceManager { 
        }

    }



    void clearDeviceFromDeviceMaps(String deviceAddress) {

        for (LinkedHashMap<String, BluetoothDevice> deviceMap : mDevicesByAddressMaps) {

            deviceMap.remove(deviceAddress);

        }

    }



    void onDeviceDisconnected(BluetoothDevice device, int deviceType) {

        mLocalLog.log("Device disconnected -- address: " + device.getAddress() + " deviceType: "

                + deviceType);

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

+18 −0
Original line number Diff line number Diff line
@@ -514,6 +514,24 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
        assertFalse(mBluetoothDeviceManager.isHearingAidSetAsCommunicationDevice());

    }



    @SmallTest

    @Test

    public void testConnectedDevicesDoNotContainDuplicateDevices() {

        BluetoothDevice hfpDevice = mock(BluetoothDevice.class);

        when(hfpDevice.getAddress()).thenReturn("00:00:00:00:00:00");

        when(hfpDevice.getType()).thenReturn(BluetoothDeviceManager.DEVICE_TYPE_HEADSET);

        BluetoothDevice leDevice = mock(BluetoothDevice.class);

        when(hfpDevice.getAddress()).thenReturn("00:00:00:00:00:00");

        when(hfpDevice.getType()).thenReturn(BluetoothDeviceManager.DEVICE_TYPE_LE_AUDIO);



        mBluetoothDeviceManager.onDeviceConnected(hfpDevice,

                BluetoothDeviceManager.DEVICE_TYPE_HEADSET);

        mBluetoothDeviceManager.onDeviceConnected(leDevice,

                BluetoothDeviceManager.DEVICE_TYPE_LE_AUDIO);



        assertEquals(1, mBluetoothDeviceManager.getNumConnectedDevices());

    }



    @SmallTest

    @Test

    public void testInBandRingingEnabledForLeDevice() {