diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java index 02566155f1c9b..1f75ae329f4ae 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java @@ -139,14 +139,14 @@ public class CachedBluetoothDeviceManager { */ public synchronized String getSubDeviceSummary(CachedBluetoothDevice device) { final Set memberDevices = device.getMemberDevice(); - if (memberDevices != null) { + // TODO: check the CSIP group size instead of the real member device set size, and adjust + // the size restriction. + if (memberDevices.size() == 1) { for (CachedBluetoothDevice memberDevice : memberDevices) { - if (!memberDevice.isConnected()) { - return null; + if (memberDevice.isConnected()) { + return memberDevice.getConnectionSummary(); } } - - return device.getConnectionSummary(); } CachedBluetoothDevice subDevice = device.getSubDevice(); if (subDevice != null && subDevice.isConnected()) {