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

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

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

Change-Id: I1a5007888e250db694c60146a22d465c95071cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2022-07-27 06:13:13 +00:00
committed by Automerger Merge Worker
parent 55b28daa93 7c85779ae9
commit 5379ffded7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -576,6 +576,15 @@ public class LocalBluetoothProfileManager {
return; 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 (mHeadsetProfile != null) {
if ((ArrayUtils.contains(localUuids, BluetoothUuid.HSP_AG) if ((ArrayUtils.contains(localUuids, BluetoothUuid.HSP_AG)
&& ArrayUtils.contains(uuids, BluetoothUuid.HSP)) && ArrayUtils.contains(uuids, BluetoothUuid.HSP))
@@ -660,11 +669,6 @@ public class LocalBluetoothProfileManager {
removedProfiles.remove(mHearingAidProfile); 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)) { if (mSapProfile != null && ArrayUtils.contains(uuids, BluetoothUuid.SAP)) {
profiles.add(mSapProfile); profiles.add(mSapProfile);
removedProfiles.remove(mSapProfile); removedProfiles.remove(mSapProfile);