Update PBAP info for all pairing dialogs. DO NOT MERGE (618b808b) · Commits · e / os / android_packages_apps_Settings

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

+14 −8

Original line number	Diff line number	Diff line
		@@ -23,12 +23,16 @@ import android.text.Editable;
		import android.util.Log;
		import android.widget.CompoundButton;
		import android.widget.CompoundButton.OnCheckedChangeListener;

		import com.android.settings.R;
		import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.bluetooth.LocalBluetoothProfile;

		import java.util.Locale;

		import android.support.annotation.VisibleForTesting;

		/**
		* A controller used by {@link BluetoothPairingDialog} to manage connection state while we try to
		* pair with a bluetooth device. It includes methods that allow the
		@@ -50,8 +54,10 @@ public class BluetoothPairingController implements OnCheckedChangeListener,

		// Bluetooth dependencies for the connection we are trying to establish
		private LocalBluetoothManager mBluetoothManager;
		private BluetoothDevice mDevice;
		private int mType;
		@VisibleForTesting
		BluetoothDevice mDevice;
		@VisibleForTesting
		int mType;
		private String mUserInput;
		private String mPasskeyFormatted;
		private int mPasskey;
		@@ -82,7 +88,6 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
		mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
		mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
		mPasskeyFormatted = formatKey(mPasskey);

		}

		@Override
		@@ -96,12 +101,13 @@ public class BluetoothPairingController implements OnCheckedChangeListener,

		@Override
		public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
		if (getDialogType() == USER_ENTRY_DIALOG) {
		if (mPbapAllowed) {
		mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
		} else {
		mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
		}

		if (getDialogType() == USER_ENTRY_DIALOG) {
		onPair(mUserInput);
		} else {
		onPair(null);