Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5379ffde authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1a5007888e250db694c60146a22d465c95071cea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55b28daa 7c85779a

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -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);