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

Update PBAP info for all pairing dialogs. DO NOT MERGE

Browse Source 
This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.

This CL fix it by updating PBAP for all dialogs.

Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55)
This commit is contained in:
jackqdyulei
2018-06-19 16:52:07 -07:00
committed by Hansong Zhang
parent 62158f0943
commit ff171eff8e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,12 +23,16 @@ import android.text.Editable;
import android.util.Log; import android.util.Log;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfile;
import java.util.Locale; import java.util.Locale;
import android.support.annotation.VisibleForTesting;
/** /**
* A controller used by {@link BluetoothPairingDialog} to manage connection state while we try to * 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 * 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 // Bluetooth dependencies for the connection we are trying to establish
private LocalBluetoothManager mBluetoothManager; private LocalBluetoothManager mBluetoothManager;
private BluetoothDevice mDevice; @VisibleForTesting
private int mType; BluetoothDevice mDevice;
@VisibleForTesting
int mType;
private String mUserInput; private String mUserInput;
private String mPasskeyFormatted; private String mPasskeyFormatted;
private int mPasskey; private int mPasskey;
@@ -82,7 +88,6 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice); mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile(); mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
mPasskeyFormatted = formatKey(mPasskey); mPasskeyFormatted = formatKey(mPasskey);
} }
@Override @Override
@@ -96,12 +101,13 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
@Override @Override
public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) { public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
if (mPbapAllowed) {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
} else {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
if (getDialogType() == USER_ENTRY_DIALOG) { if (getDialogType() == USER_ENTRY_DIALOG) {
if (mPbapAllowed) {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
} else {
mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
onPair(mUserInput); onPair(mUserInput);
} else { } else {
onPair(null); onPair(null);