Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" (ff985c6b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -148,15 +148,12 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
	*/		*/
	private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,		private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
	SwitchPreference profilePref) {		SwitchPreference profilePref) {
	if (profile instanceof PbapServerProfile) {
	mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
	// We don't need to do the additional steps below for this profile.
	return;
	}
	mCachedDevice.disconnect(profile);		mCachedDevice.disconnect(profile);
	profile.setPreferred(device, false);		profile.setPreferred(device, false);
	if (profile instanceof MapProfile) {		if (profile instanceof MapProfile) {
	mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);		mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
			} else if (profile instanceof PbapServerProfile) {
			mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
	}		}
	}		}