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

Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae

Browse Source 
am: ff985c6bc7

Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a
This commit is contained in:
Hemant Gupta
2018-08-17 12:57:33 -07:00
committed by android-build-merger
parent 6136194c4d ff985c6bc7
commit 0c75671a5f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
View File

@@ -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);
} }
} }