Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the device summary shown twice issue" am: 0a80b6a3bc am: 0f423ebc5e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842101

Change-Id: Ic84b29e928cb3a57423f160bf2acc0a99e396073
This commit is contained in:
Treehugger Robot
2021-10-05 06:49:04 +00:00
committed by Automerger Merge Worker
parent dc3e015589 0f423ebc5e
commit 1ae038a2c5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -139,14 +139,14 @@ public class CachedBluetoothDeviceManager {
*/ */
public synchronized String getSubDeviceSummary(CachedBluetoothDevice device) { public synchronized String getSubDeviceSummary(CachedBluetoothDevice device) {
final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice(); 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) { for (CachedBluetoothDevice memberDevice : memberDevices) {
if (!memberDevice.isConnected()) { if (memberDevice.isConnected()) {
return null; return memberDevice.getConnectionSummary();
} }
} }
return device.getConnectionSummary();
} }
CachedBluetoothDevice subDevice = device.getSubDevice(); CachedBluetoothDevice subDevice = device.getSubDevice();
if (subDevice != null && subDevice.isConnected()) { if (subDevice != null && subDevice.isConnected()) {