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

Commit d94d141d authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix ConcurrentModificationException in BT handling"

am: 0e75bbb4

Change-Id: Ic910f63c0b9b325fcc5bee4c91cf7394e0815faa
parents ec3bfae1 0e75bbb4
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -142,7 +142,10 @@ public class BluetoothDeviceManager {
    // Same as getConnectedDevices except it filters out the hearing aid devices that are linked
    // together by their hiSyncId.
    public Collection<BluetoothDevice> getUniqueConnectedDevices() {
        ArrayList<BluetoothDevice> result = new ArrayList<>(mHfpDevicesByAddress.values());
        ArrayList<BluetoothDevice> result;
        synchronized (mLock) {
            result = new ArrayList<>(mHfpDevicesByAddress.values());
        }
        Set<Long> seenHiSyncIds = new LinkedHashSet<>();
        // Add the left-most active device to the seen list so that we match up with the list
        // generated in BluetoothRouteManager.