Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" (b21a10b2) · Commits · e / os / android_packages_apps_Settings

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,22 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
		}
		}

		/**
		* Update Phone book permission
		*
		*/
		public void setContactSharingState() {
		if ((mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_ALLOWED)
		&& (mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_REJECTED)) {
		if (mDevice.getBluetoothClass().getDeviceClass()
		== BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
		onCheckedChanged(null, true);
		} else {
		onCheckedChanged(null, false);
		}
		}
		}

		/**
		* A method for querying if the provided editable is a valid passkey/pin format for this device.
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i

		contactSharing.setVisibility(mPairingController.isProfileReady()
		? View.GONE : View.VISIBLE);
		mPairingController.setContactSharingState();
		contactSharing.setOnCheckedChangeListener(mPairingController);
		contactSharing.setChecked(mPairingController.getContactSharingState());

		@@ -314,6 +315,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i

		contactSharing.setVisibility(
		mPairingController.isProfileReady() ? View.GONE : View.VISIBLE);
		mPairingController.setContactSharingState();
		contactSharing.setChecked(mPairingController.getContactSharingState());
		contactSharing.setOnCheckedChangeListener(mPairingController);