diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java | 10 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 2118d2cbf4b3..f03ff00828a6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -1518,10 +1518,15 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> * list. */ public void switchMemberDeviceContent(CachedBluetoothDevice newMainDevice) { - // Backup from main device + // Remove the sub device from mMemberDevices first to prevent hash mismatch problem due + // to mDevice switch + removeMemberDevice(newMainDevice); + + // Backup from current main device final BluetoothDevice tmpDevice = mDevice; final short tmpRssi = mRssi; final boolean tmpJustDiscovered = mJustDiscovered; + // Set main device from sub device release(); mDevice = newMainDevice.mDevice; @@ -1535,6 +1540,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> newMainDevice.mRssi = tmpRssi; newMainDevice.mJustDiscovered = tmpJustDiscovered; newMainDevice.fillData(); + + // Add the sub device back into mMemberDevices with correct hash + addMemberDevice(newMainDevice); } /** diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java index efba953e3c6b..111a2c1a07ea 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java @@ -186,6 +186,14 @@ public class HearingAidDeviceManager { if (cachedDevice.getHiSyncId() != hiSyncId) { continue; } + + // The remote device supports CSIP, the other ear should be processed as a member + // device. Ignore hiSyncId grouping from ASHA here. + if (cachedDevice.getProfiles().stream().anyMatch( + profile -> profile instanceof CsipSetCoordinatorProfile)) { + continue; + } + if (firstMatchedIndex == -1) { // Found the first one firstMatchedIndex = i; |