Merge "Add LE audio broadcast dynamic switch feature" am: cd129a99ad am: 3f97bbb450 am: 82ad8972f9 (7cef7923) · Commits · e / os / android_packages_modules_Bluetooth

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

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -766,8 +766,9 @@ public class AdapterService extends Service {
	nonSupportedProfiles.add(BassClientService.class);		nonSupportedProfiles.add(BassClientService.class);
	}		}

	if (isLeAudioBroadcastSourceSupported()) {		if (!isLeAudioBroadcastSourceSupported()) {
	Config.addSupportedProfile(BluetoothProfile.LE_AUDIO_BROADCAST);		Config.updateSupportedProfileMask(
			false, LeAudioService.class, BluetoothProfile.LE_AUDIO_BROADCAST);
	}		}

	if (!nonSupportedProfiles.isEmpty()) {		if (!nonSupportedProfiles.isEmpty()) {
	@@ -3545,7 +3546,8 @@ public class AdapterService extends Service {
	return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;		return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;
	}		}

	if (service.isLeAudioBroadcastSourceSupported()) {		long supportBitMask = Config.getSupportedProfilesBitMask();
			if ((supportBitMask & (1 << BluetoothProfile.LE_AUDIO_BROADCAST)) != 0) {
	return BluetoothStatusCodes.FEATURE_SUPPORTED;		return BluetoothStatusCodes.FEATURE_SUPPORTED;
	}		}

	@@ -4849,8 +4851,7 @@ public class AdapterService extends Service {
	* @return true, if the LE audio broadcast source is supported		* @return true, if the LE audio broadcast source is supported
	*/		*/
	public boolean isLeAudioBroadcastSourceSupported() {		public boolean isLeAudioBroadcastSourceSupported() {
	return BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false)		return mAdapterProperties.isLePeriodicAdvertisingSupported()
	&& mAdapterProperties.isLePeriodicAdvertisingSupported()
	&& mAdapterProperties.isLeExtendedAdvertisingSupported()		&& mAdapterProperties.isLeExtendedAdvertisingSupported()
	&& mAdapterProperties.isLeIsochronousBroadcasterSupported();		&& mAdapterProperties.isLeIsochronousBroadcasterSupported();
	}		}
	@@ -4867,6 +4868,10 @@ public class AdapterService extends Service {
	\|\| mAdapterProperties.isLePeriodicAdvertisingSyncTransferRecipientSupported());		\|\| mAdapterProperties.isLePeriodicAdvertisingSyncTransferRecipientSupported());
	}		}

			public long getSupportedProfilesBitMask() {
			return Config.getSupportedProfilesBitMask();
			}

	/**		/**
	* Check if the LE audio CIS central feature is supported.		* Check if the LE audio CIS central feature is supported.
	*		*

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

+28 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,13 +61,14 @@ 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;

	private static final String LE_AUDIO_DYNAMIC_SWITCH_PROPERTY =		private static final String LE_AUDIO_DYNAMIC_SWITCH_PROPERTY =
	"ro.bluetooth.leaudio_switcher.supported";		"ro.bluetooth.leaudio_switcher.supported";
			private static final String LE_AUDIO_BROADCAST_DYNAMIC_SWITCH_PROPERTY =
			"ro.bluetooth.leaudio_broadcast_switcher.supported";
	private static final String LE_AUDIO_DYNAMIC_ENABLED_PROPERTY =		private static final String LE_AUDIO_DYNAMIC_ENABLED_PROPERTY =
	"persist.bluetooth.leaudio_switcher.enabled";		"persist.bluetooth.leaudio_switcher.enabled";

	@@ -174,6 +175,11 @@ public class Config {
	private static boolean sIsGdEnabledUptoScanningLayer = false;		private static boolean sIsGdEnabledUptoScanningLayer = false;

	static void init(Context ctx) {		static void init(Context ctx) {
			if (LeAudioService.isBroadcastEnabled()) {
			updateSupportedProfileMask(
			true, LeAudioService.class, BluetoothProfile.LE_AUDIO_BROADCAST);
			}

	final boolean leAudioDynamicSwitchSupported =		final boolean leAudioDynamicSwitchSupported =
	SystemProperties.getBoolean(LE_AUDIO_DYNAMIC_SWITCH_PROPERTY, false);		SystemProperties.getBoolean(LE_AUDIO_DYNAMIC_SWITCH_PROPERTY, false);

	@@ -214,6 +220,15 @@ public class Config {
	setProfileEnabled(TbsService.class, enable);		setProfileEnabled(TbsService.class, enable);
	setProfileEnabled(McpService.class, enable);		setProfileEnabled(McpService.class, enable);
	setProfileEnabled(VolumeControlService.class, enable);		setProfileEnabled(VolumeControlService.class, enable);

			final boolean broadcastDynamicSwitchSupported =
			SystemProperties.getBoolean(LE_AUDIO_BROADCAST_DYNAMIC_SWITCH_PROPERTY, false);

			if (broadcastDynamicSwitchSupported) {
			setProfileEnabled(BassClientService.class, enable);
			updateSupportedProfileMask(
			enable, LeAudioService.class, BluetoothProfile.LE_AUDIO_BROADCAST);
			}
	}		}

	/**		/**
	@@ -235,8 +250,17 @@ public class Config {
	sSupportedProfiles = profilesList.toArray(new Class[profilesList.size()]);		sSupportedProfiles = profilesList.toArray(new Class[profilesList.size()]);
	}		}

	static void addSupportedProfile(int supportedProfile) {		static void updateSupportedProfileMask(Boolean enable, Class profile, int supportedProfile) {
	sSupportedMask \|= (1 << supportedProfile);		for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {
			if (config.mClass == profile) {
			if (enable) {
			config.mMask \|= 1 << supportedProfile;
			} else {
			config.mMask &= ~(1 << supportedProfile);
			}
			return;
			}
			}
	}		}

	static HashSet<Class> getLeAudioUnicastProfiles() {		static HashSet<Class> getLeAudioUnicastProfiles() {
	@@ -262,7 +286,7 @@ public class Config {
	}		}

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

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,6 +181,10 @@ public class LeAudioService extends ProfileService {
	return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);		return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);
	}		}

			public static boolean isBroadcastEnabled() {
			return BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);
			}

	@Override		@Override
	protected void create() {		protected void create() {
	Log.i(TAG, "create()");		Log.i(TAG, "create()");
	@@ -239,7 +243,9 @@ public class LeAudioService extends ProfileService {
	LeAudioTmapGattServer.TMAP_ROLE_FLAG_CG \| LeAudioTmapGattServer.TMAP_ROLE_FLAG_UMS;		LeAudioTmapGattServer.TMAP_ROLE_FLAG_CG \| LeAudioTmapGattServer.TMAP_ROLE_FLAG_UMS;

	// Initialize Broadcast native interface		// Initialize Broadcast native interface
	if (mAdapterService.isLeAudioBroadcastSourceSupported()) {		if ((mAdapterService.getSupportedProfilesBitMask()
			& (1 << BluetoothProfile.LE_AUDIO_BROADCAST)) != 0) {
			Log.i(TAG, "Init Le Audio broadcaster");
	mBroadcastCallbacks = new RemoteCallbackList<IBluetoothLeBroadcastCallback>();		mBroadcastCallbacks = new RemoteCallbackList<IBluetoothLeBroadcastCallback>();
	mLeAudioBroadcasterNativeInterface = Objects.requireNonNull(		mLeAudioBroadcasterNativeInterface = Objects.requireNonNull(
	LeAudioBroadcasterNativeInterface.getInstance(),		LeAudioBroadcasterNativeInterface.getInstance(),