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

Commit 1381b4ed authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Prefer LE Audio over ASHA if both devices support both profiles." am: 1112627a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2398872



Change-Id: I8518e6e408d4895767c94acc6d39c22c45f689f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de2961eb 1112627a

android/app/src/com/android/bluetooth/btservice/PhonePolicy.java

+9 −3
Original line number Diff line number Diff line
@@ -355,10 +355,12 @@ class PhonePolicy { 
                    BluetoothProfile.PAN, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

        }



        boolean isLeAudioProfileAllowed = false;

        if ((leAudioService != null) && Utils.arrayContains(uuids,

                BluetoothUuid.LE_AUDIO) && (leAudioService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {

            debugLog("setting le audio profile priority for device " + device);

            isLeAudioProfileAllowed = true;

            mAdapterService.getDatabase().setProfileConnectionPolicy(device,

                    BluetoothProfile.LE_AUDIO, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

            if (mPreferLeAudioOnlyMode) {
@@ -384,10 +386,14 @@ class PhonePolicy { 
        if ((hearingAidService != null) && Utils.arrayContains(uuids,

                BluetoothUuid.HEARING_AID) && (hearingAidService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {

            if (isLeAudioProfileAllowed) {

                debugLog("LE Audio preferred over ASHA for device " + device);

            } else {

                debugLog("setting hearing aid profile priority for device " + device);

                mAdapterService.getDatabase().setProfileConnectionPolicy(device,

                        BluetoothProfile.HEARING_AID, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

            }

        }



        if ((volumeControlService != null) && Utils.arrayContains(uuids,

                BluetoothUuid.VOLUME_CONTROL) && (volumeControlService.getConnectionPolicy(device)