Merge "[LE unicast] The icon is not LE Audio one" into tm-qpr-dev (7c85779a) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -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);