Merge "Add Broadcast Profile bitmask to the supported mask if supported" (aed74b76) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −0

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

			if (isLeAudioBroadcastSourceSupported()) {
			Config.addSupportedProfile(BluetoothProfile.LE_AUDIO_BROADCAST);
			}

	if (!nonSupportedProfiles.isEmpty()) {		if (!nonSupportedProfiles.isEmpty()) {
	// Remove non-supported profiles from the supported list		// Remove non-supported profiles from the supported list
	// since the controller doesn't support		// since the controller doesn't support

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

+6 −1

Original line number	Original line	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_HEARING_AID = "settings_bluetooth_hearing_aid";
	private static final String FEATURE_BATTERY = "settings_bluetooth_battery";		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 FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";
	private static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;		private static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;
	@@ -207,6 +208,10 @@ public class Config {
	sSupportedProfiles = profilesList.toArray(new Class[profilesList.size()]);		sSupportedProfiles = profilesList.toArray(new Class[profilesList.size()]);
	}		}

			static void addSupportedProfile(int supportedProfile) {
			sSupportedMask \|= (1 << supportedProfile);
			}

	static HashSet<Class> geLeAudioUnicastProfiles() {		static HashSet<Class> geLeAudioUnicastProfiles() {
	return mLeAudioUnicastProfiles;		return mLeAudioUnicastProfiles;
	}		}
	@@ -230,7 +235,7 @@ public class Config {
	}		}

	static long getSupportedProfilesBitMask() {		static long getSupportedProfilesBitMask() {
	long mask = 0;		long mask = sSupportedMask;
	for (final Class profileClass : getSupportedProfiles()) {		for (final Class profileClass : getSupportedProfiles()) {
	mask \|= getProfileMask(profileClass);		mask \|= getProfileMask(profileClass);
	}		}