PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" am: b21a10b2ff

Browse Source 
am: a84a535729

Change-Id: Ia8ed56e2da6641a107af912efdf497d90c0d43ed
This commit is contained in:
Hemant Gupta
2017-11-30 17:43:08 +00:00
committed by android-build-merger
parent 68af33f2df a84a535729
commit cf2557e8f4
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/bluetooth/BluetoothPairingController.java
View File

@@ -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. * A method for querying if the provided editable is a valid passkey/pin format for this device.
* *

2
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
View File

@@ -241,6 +241,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
contactSharing.setVisibility(mPairingController.isProfileReady() contactSharing.setVisibility(mPairingController.isProfileReady()
? View.GONE : View.VISIBLE); ? View.GONE : View.VISIBLE);
mPairingController.setContactSharingState();
contactSharing.setOnCheckedChangeListener(mPairingController); contactSharing.setOnCheckedChangeListener(mPairingController);
contactSharing.setChecked(mPairingController.getContactSharingState()); contactSharing.setChecked(mPairingController.getContactSharingState());
@@ -331,6 +332,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
contactSharing.setVisibility( contactSharing.setVisibility(
mPairingController.isProfileReady() ? View.GONE : View.VISIBLE); mPairingController.isProfileReady() ? View.GONE : View.VISIBLE);
mPairingController.setContactSharingState();
contactSharing.setChecked(mPairingController.getContactSharingState()); contactSharing.setChecked(mPairingController.getContactSharingState());
contactSharing.setOnCheckedChangeListener(mPairingController); contactSharing.setOnCheckedChangeListener(mPairingController);