diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-05 06:01:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-05 06:01:30 +0000 |
commit | 0a80b6a3bcadcbd0b5dd68349fbc7de11350c5f9 (patch) | |
tree | 772490505131ac548f129fbf1b792a34c07a30e1 | |
parent | 98ff8ecdaa5be2426d09c557ff70f234a1369fb0 (diff) | |
parent | cd5a8483be77bd06f3595d9d8aab2070e9f145bc (diff) | |
download | base-0a80b6a3bcadcbd0b5dd68349fbc7de11350c5f9.tar.gz |
Merge "Fix the device summary shown twice issue"
-rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java | 10 |
1 files 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 02566155f1c9..1f75ae329f4a 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<CachedBluetoothDevice> 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()) { |