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

Commit def3d6fd authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Add Broadcast Profile bitmask to the supported mask if supported" am: aed74b76 

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



Change-Id: Ie9decd723186cf1cfe2cac90b4e59389cb1e205a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6056a8a0 aed74b76

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

+4 −0
Original line number Diff line number Diff line
@@ -758,6 +758,10 @@ public class AdapterService extends Service { 
            nonSupportedProfiles.add(BassClientService.class);

        }



        if (isLeAudioBroadcastSourceSupported()) {

            Config.addSupportedProfile(BluetoothProfile.LE_AUDIO_BROADCAST);

        }



        if (!nonSupportedProfiles.isEmpty()) {

            // Remove non-supported profiles from the supported list

            // since the controller doesn't support

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

+6 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class Config { 


    private static final String FEATURE_HEARING_AID = "settings_bluetooth_hearing_aid";

    private static final String FEATURE_BATTERY = "settings_bluetooth_battery";

    private static long sSupportedMask = 0;



    private static final String FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";

    private static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;
@@ -207,6 +208,10 @@ public class Config { 
        sSupportedProfiles = profilesList.toArray(new Class[profilesList.size()]);

    }



    static void addSupportedProfile(int supportedProfile) {

        sSupportedMask |= (1 << supportedProfile);

    }



    static HashSet<Class> geLeAudioUnicastProfiles() {

        return mLeAudioUnicastProfiles;

    }
@@ -230,7 +235,7 @@ public class Config { 
    }



    static long getSupportedProfilesBitMask() {

        long mask = 0;

        long mask = sSupportedMask;

        for (final Class profileClass : getSupportedProfiles()) {

            mask |= getProfileMask(profileClass);

        }