Merge "Return false getProfileProxy when not supported" into stage-aosp-master (8108b926) · Commits · e / os / android_packages_modules_Bluetooth

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -758,7 +758,7 @@ public class AdapterService extends Service {
		HashSet<Class> nonSupportedProfiles = new HashSet<>();

		if (!isLeConnectedIsochronousStreamCentralSupported()) {
		nonSupportedProfiles.addAll(Config.geLeAudioUnicastProfiles());
		nonSupportedProfiles.addAll(Config.getLeAudioUnicastProfiles());
		}

		if (!isLeAudioBroadcastAssistantSupported()) {
		@@ -3552,7 +3552,7 @@ public class AdapterService extends Service {

		HashSet<Class> supportedProfileServices =
		new HashSet<Class>(Arrays.asList(Config.getSupportedProfiles()));
		HashSet<Class> leAudioUnicastProfiles = Config.geLeAudioUnicastProfiles();
		HashSet<Class> leAudioUnicastProfiles = Config.getLeAudioUnicastProfiles();

		if (supportedProfileServices.containsAll(leAudioUnicastProfiles)) {
		return BluetoothStatusCodes.FEATURE_SUPPORTED;

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@ public class Config {
		/**
		* List of profile services related to LE audio
		*/
		// TODO: Include LE_CALL_CONTROL. Be sure that we need to update BluetoothAdapter.java
		// for isLeAudioSupported and getProfileProxy accordingly
		private static final HashSet<Class> mLeAudioUnicastProfiles = new HashSet<Class>(
		Arrays.asList(LeAudioService.class,
		VolumeControlService.class,
		@@ -239,7 +241,7 @@ public class Config {
		sSupportedMask \|= (1 << supportedProfile);
		}

		static HashSet<Class> geLeAudioUnicastProfiles() {
		static HashSet<Class> getLeAudioUnicastProfiles() {
		return mLeAudioUnicastProfiles;
		}

framework/java/android/bluetooth/BluetoothAdapter.java

+97 −50

Original line number	Diff line number	Diff line
		@@ -2624,6 +2624,10 @@ public final class BluetoothAdapter {
		* supported, {@link BluetoothStatusCodes#FEATURE_NOT_SUPPORTED} if the feature is not
		* supported, or an error code.
		*
		* Android thinks LE audio is supported when the device supports all following profiles:
		* {@link BluetoothProfile#LE_AUDIO}, {@link BluetoothProfile#CSIP_SET_COORDINATOR},
		* volume control profile and media control profile for server role.
		*
		* @return whether the LE audio is supported
		* @throws IllegalStateException if the bluetooth service is null
		*/
		@@ -3578,17 +3582,17 @@ public final class BluetoothAdapter {
		/**
		* Get the profile proxy object associated with the profile.
		*
		* <p>Profile can be one of {@link BluetoothProfile#HEADSET}, {@link BluetoothProfile#A2DP},
		* {@link BluetoothProfile#GATT}, {@link BluetoothProfile#HEARING_AID}, or {@link
		* BluetoothProfile#GATT_SERVER}. Clients must implement {@link
		* BluetoothProfile.ServiceListener} to get notified of the connection status and to get the
		* proxy object.
		* <p>Profile can be one of {@link BluetoothProfile#A2DP},
		* {@link BluetoothProfile#HEADSET}, {@link BluetoothProfile#HID_DEVICE},
		* {@link BluetoothProfile#SAP}, {@link BluetoothProfile#HAP_CLIENT},
		* {@link BluetoothProfile#HEARING_AID}, {@link BluetoothProfile#LE_AUDIO},
		* and {@link BluetoothProfile#CSIP_SET_COORDINATOR}.
		* Clients must implement {@link BluetoothProfile.ServiceListener} to get notified of
		* the connection status and to get the proxy object.
		*
		* @param context Context of the application
		* @param listener The service Listener for connection callbacks.
		* @param profile The Bluetooth profile; either {@link BluetoothProfile#HEADSET},
		* {@link BluetoothProfile#A2DP}, {@link BluetoothProfile#GATT}, {@link
		* BluetoothProfile#HEARING_AID} or {@link BluetoothProfile#GATT_SERVER}.
		* @param profile The Bluetooth profile.
		* @return true on success, false on error
		*/
		@SuppressLint({
		@@ -3601,50 +3605,84 @@ public final class BluetoothAdapter {
		return false;
		}

		// NOTE: We can't rely on BluetoothProperties.isProfileXxxEnabled() method for the profiles
		// that can be changed by the developer options in Settings app.
		// See com.android.bluetooth.btservice.Config for details.
		if (profile == BluetoothProfile.HEADSET) {
		if (BluetoothProperties.isProfileHfpAgEnabled().orElse(false)) {
		BluetoothHeadset headset = new BluetoothHeadset(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.A2DP) {
		if (BluetoothProperties.isProfileA2dpSourceEnabled().orElse(false)) {
		BluetoothA2dp a2dp = new BluetoothA2dp(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.A2DP_SINK) {
		if (BluetoothProperties.isProfileA2dpSinkEnabled().orElse(false)) {
		BluetoothA2dpSink a2dpSink = new BluetoothA2dpSink(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
		BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener, this);
		if (BluetoothProperties.isProfileAvrcpControllerEnabled().orElse(false)) {
		BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener,
		this);
		return true;
		}
		} else if (profile == BluetoothProfile.HID_HOST) {
		if (BluetoothProperties.isProfileHidHostEnabled().orElse(false)) {
		BluetoothHidHost iDev = new BluetoothHidHost(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.PAN) {
		if (BluetoothProperties.isProfilePanNapEnabled().orElse(false)
		\|\| BluetoothProperties.isProfilePanPanuEnabled().orElse(false)) {
		BluetoothPan pan = new BluetoothPan(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.PBAP) {
		if (BluetoothProperties.isProfilePbapServerEnabled().orElse(false)) {
		BluetoothPbap pbap = new BluetoothPbap(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.HEALTH) {
		Log.e(TAG, "getProfileProxy(): BluetoothHealth is deprecated");
		return false;
		} else if (profile == BluetoothProfile.MAP) {
		if (BluetoothProperties.isProfileMapServerEnabled().orElse(false)) {
		BluetoothMap map = new BluetoothMap(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.HEADSET_CLIENT) {
		if (BluetoothProperties.isProfileHfpHfEnabled().orElse(false)) {
		BluetoothHeadsetClient headsetClient =
		new BluetoothHeadsetClient(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.SAP) {
		if (BluetoothProperties.isProfileSapServerEnabled().orElse(false)) {
		BluetoothSap sap = new BluetoothSap(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.PBAP_CLIENT) {
		if (BluetoothProperties.isProfilePbapClientEnabled().orElse(false)) {
		BluetoothPbapClient pbapClient = new BluetoothPbapClient(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.MAP_CLIENT) {
		if (BluetoothProperties.isProfileMapClientEnabled().orElse(false)) {
		BluetoothMapClient mapClient = new BluetoothMapClient(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.HID_DEVICE) {
		if (BluetoothProperties.isProfileHidDeviceEnabled().orElse(false)) {
		BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.HAP_CLIENT) {
		// No proper way to check this before creating this BluetoothProfile.
		// BluetoothProperties.isProfileHapClientEnabled() could return a wrong value
		// depends on the status of developer options in Settings app.
		BluetoothHapClient HapClient = new BluetoothHapClient(context, listener);
		return true;
		} else if (profile == BluetoothProfile.HEARING_AID) {
		@@ -3652,31 +3690,40 @@ public final class BluetoothAdapter {
		BluetoothHearingAid hearingAid = new BluetoothHearingAid(context, listener, this);
		return true;
		}
		return false;
		} else if (profile == BluetoothProfile.LE_AUDIO) {
		if (isLeAudioSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {
		BluetoothLeAudio leAudio = new BluetoothLeAudio(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.LE_AUDIO_BROADCAST) {
		if (isLeAudioBroadcastSourceSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {
		BluetoothLeBroadcast leAudio = new BluetoothLeBroadcast(context, listener);
		return true;
		}
		} else if (profile == BluetoothProfile.VOLUME_CONTROL) {
		if (isLeAudioSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {
		BluetoothVolumeControl vcs = new BluetoothVolumeControl(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.CSIP_SET_COORDINATOR) {
		if (isLeAudioSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {
		BluetoothCsipSetCoordinator csipSetCoordinator =
		new BluetoothCsipSetCoordinator(context, listener, this);
		return true;
		}
		} else if (profile == BluetoothProfile.LE_CALL_CONTROL) {
		// No proper way to check this before creating this BluetoothProfile.
		BluetoothLeCallControl tbs = new BluetoothLeCallControl(context, listener);
		return true;
		} else if (profile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT) {
		if (isLeAudioBroadcastAssistantSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {
		BluetoothLeBroadcastAssistant leAudioBroadcastAssistant =
		new BluetoothLeBroadcastAssistant(context, listener);
		return true;
		} else {
		return false;
		}
		}
		return false;
		}

		/**
		* Close the connection of the profile proxy to the Service.