Merge "BluetoothAdapter.disconnectAllEnabledProfiles() now disconnects pbap... (3240d25e) · Commits · e / os / android_packages_apps_Bluetooth

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -2462,9 +2462,14 @@ public class AdapterService extends Service {
		}
		if (mMapClientService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.MAP_CLIENT, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting MAP");
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting MAP Client");
		mMapClientService.disconnect(device);
		}
		if (mMapService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.MAP, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting MAP");
		mMapService.disconnect(device);
		}
		if (mHidDeviceService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.HID_DEVICE, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hid Device Profile");
		@@ -2482,9 +2487,14 @@ public class AdapterService extends Service {
		}
		if (mPbapClientService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.PBAP_CLIENT, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pbap");
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pbap Client");
		mPbapClientService.disconnect(device);
		}
		if (mPbapService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.PBAP, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Pbap Server");
		mPbapService.disconnect(device);
		}
		if (mHearingAidService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
		BluetoothProfile.HEARING_AID, device)) {
		Log.i(TAG, "disconnectAllEnabledProfiles: Disconnecting Hearing Aid Profile");

src/com/android/bluetooth/pbap/BluetoothPbapService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -493,7 +493,11 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
		return false;
		}

		void disconnect(BluetoothDevice device) {
		/**
		* Disconnects pbap server profile with device
		* @param device is the remote bluetooth device
		*/
		public void disconnect(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
		synchronized (mPbapStateMachineMap) {
		PbapStateMachine sm = mPbapStateMachineMap.get(device);