Merge "Disconnect also connecting Bluetooth device" (88585ad5) · Commits · e / os / android_packages_modules_Bluetooth

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

+72 −36

Original line number	Diff line number	Diff line
		@@ -4543,95 +4543,131 @@ public class AdapterService extends Service {
		return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;
		}

		if (mA2dpService != null && mA2dpService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mA2dpService != null && (mA2dpService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mA2dpService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting A2dp");
		mA2dpService.disconnect(device);
		}
		if (mA2dpSinkService != null && mA2dpSinkService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mA2dpSinkService != null && (mA2dpSinkService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mA2dpSinkService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting A2dp Sink");
		mA2dpSinkService.disconnect(device);
		}
		if (mHeadsetService != null && mHeadsetService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHeadsetService != null && (mHeadsetService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHeadsetService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG,
		"disconnectAllEnabledProfiles: Disconnecting Headset Profile");
		mHeadsetService.disconnect(device);
		}
		if (mHeadsetClientService != null && mHeadsetClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHeadsetClientService != null && (mHeadsetClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHeadsetClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting HFP");
		mHeadsetClientService.disconnect(device);
		}
		if (mMapClientService != null && mMapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mMapClientService != null && (mMapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mMapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting MAP Client");
		mMapClientService.disconnect(device);
		}
		if (mMapService != null && mMapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mMapService != null && (mMapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mMapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting MAP");
		mMapService.disconnect(device);
		}
		if (mHidDeviceService != null && mHidDeviceService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHidDeviceService != null && (mHidDeviceService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHidDeviceService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hid Device Profile");
		mHidDeviceService.disconnect(device);
		}
		if (mHidHostService != null && mHidHostService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHidHostService != null && (mHidHostService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHidHostService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hid Host Profile");
		mHidHostService.disconnect(device);
		}
		if (mPanService != null && mPanService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mPanService != null && (mPanService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mPanService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pan Profile");
		mPanService.disconnect(device);
		}
		if (mPbapClientService != null && mPbapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mPbapClientService != null && (mPbapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mPbapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pbap Client");
		mPbapClientService.disconnect(device);
		}
		if (mPbapService != null && mPbapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mPbapService != null && (mPbapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mPbapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pbap Server");
		mPbapService.disconnect(device);
		}
		if (mHearingAidService != null && mHearingAidService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHearingAidService != null && (mHearingAidService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHearingAidService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hearing Aid Profile");
		mHearingAidService.disconnect(device);
		}
		if (mHapClientService != null && mHapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mHapClientService != null && (mHapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mHapClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hearing Access Profile Client");
		mHapClientService.disconnect(device);
		}
		if (mVolumeControlService != null && mVolumeControlService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mVolumeControlService != null && (mVolumeControlService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mVolumeControlService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Volume Control Profile");
		mVolumeControlService.disconnect(device);
		}
		if (mSapService != null && mSapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mSapService != null && (mSapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mSapService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Sap Profile");
		mSapService.disconnect(device);
		}
		if (mCsipSetCoordinatorService != null
		&& mCsipSetCoordinatorService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		&& (mCsipSetCoordinatorService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mCsipSetCoordinatorService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Coordinater Set Profile");
		mCsipSetCoordinatorService.disconnect(device);
		}
		if (mLeAudioService != null && mLeAudioService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mLeAudioService != null && (mLeAudioService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mLeAudioService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting LeAudio profile (BAP)");
		mLeAudioService.disconnect(device);
		}
		if (mBassClientService != null && mBassClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED) {
		if (mBassClientService != null && (mBassClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTED
		\|\| mBassClientService.getConnectionState(device)
		== BluetoothProfile.STATE_CONNECTING)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting "
		+ "LE Broadcast Assistant Profile");
		mBassClientService.disconnect(device);