Merge "[LE unicast] The icon is not LE Audio one" into tm-qpr-dev

This commit is contained in:
SongFerng Wang
2022-07-27 06:06:57 +00:00
committed by Android (Google) Code Review

View File

@@ -576,6 +576,15 @@ public class LocalBluetoothProfileManager {
return;
}
// The profiles list's sequence will affect the bluetooth icon at
// BluetoothUtils.getBtClassDrawableWithDescription(Context,CachedBluetoothDevice).
// Moving the LE audio profile to be the first priority if the device supports LE audio.
if (ArrayUtils.contains(uuids, BluetoothUuid.LE_AUDIO) && mLeAudioProfile != null) {
profiles.add(mLeAudioProfile);
removedProfiles.remove(mLeAudioProfile);
}
if (mHeadsetProfile != null) {
if ((ArrayUtils.contains(localUuids, BluetoothUuid.HSP_AG)
&& ArrayUtils.contains(uuids, BluetoothUuid.HSP))
@@ -660,11 +669,6 @@ public class LocalBluetoothProfileManager {
removedProfiles.remove(mHearingAidProfile);
}
if (ArrayUtils.contains(uuids, BluetoothUuid.LE_AUDIO) && mLeAudioProfile != null) {
profiles.add(mLeAudioProfile);
removedProfiles.remove(mLeAudioProfile);
}
if (mSapProfile != null && ArrayUtils.contains(uuids, BluetoothUuid.SAP)) {
profiles.add(mSapProfile);
removedProfiles.remove(mSapProfile);