From cd5a8483be77bd06f3595d9d8aab2070e9f145bc Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Mon, 4 Oct 2021 18:05:57 +0800 Subject: [PATCH] Fix the device summary shown twice issue As getSubDeviceSummy, we should check the memberDevices's size and decide if the secondarySummary need to be shown. Bug: 201491295 Bug: 150670922 Test: pair with the A2DP/HFP headset, and check the summary Change-Id: I8bb0744067733c6e17292d6c7be1c3f110d731e3 --- .../bluetooth/CachedBluetoothDeviceManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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()) {