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

Merge "Update PBAP info for all pairing dialogs."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-20 16:55:40 +00:00
committed by Android (Google) Code Review
parent 9e7bbaec9a 7015e20a55
commit 0a0551cb4d
2 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,8 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfile;
import java.util.Locale;
import androidx.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
@@ -52,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;
@@ -84,7 +88,6 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
mPasskeyFormatted = formatKey(mPasskey);
}
@Override
@@ -98,12 +101,13 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
@Override
public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
if (mPbapAllowed) {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
} else {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
if (getDialogType() == USER_ENTRY_DIALOG) {
if (mPbapAllowed) {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
} else {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
onPair(mUserInput);
} else {
onPair(null);