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

Commit 56347226 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when unpairing a device which supports CSIP" into udc-qpr-dev am: b49dc675 

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



Change-Id: If6558acf8394b473a26706da97abd25be5b42df6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3852db98 b49dc675

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

+5 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import java.sql.Timestamp;

import java.util.ArrayList;

import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.Set;
@@ -365,16 +366,17 @@ public class CachedBluetoothDeviceManager { 
    public synchronized void onDeviceUnpaired(CachedBluetoothDevice device) {

        device.setGroupId(BluetoothCsipSetCoordinator.GROUP_ID_INVALID);

        CachedBluetoothDevice mainDevice = mCsipDeviceManager.findMainDevice(device);

        final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice();

        // Should iterate through the cloned set to avoid ConcurrentModificationException

        final Set<CachedBluetoothDevice> memberDevices = new HashSet<>(device.getMemberDevice());

        if (!memberDevices.isEmpty()) {

            // Main device is unpaired, to unpair the member device

            // Main device is unpaired, also unpair the member devices

            for (CachedBluetoothDevice memberDevice : memberDevices) {

                memberDevice.unpair();

                memberDevice.setGroupId(BluetoothCsipSetCoordinator.GROUP_ID_INVALID);

                device.removeMemberDevice(memberDevice);

            }

        } else if (mainDevice != null) {

            // the member device unpaired, to unpair main device

            // Member device is unpaired, also unpair the main device

            mainDevice.unpair();

        }

        mainDevice = mHearingAidDeviceManager.findMainDevice(device);