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

Merge "PBAP Pairing Permission" into nyc-dev

Browse Source
This commit is contained in:
Sanket Agarwal
2016-04-05 23:39:55 +00:00
committed by Android (Google) Code Review
parent 84948db8d0 e6de78375f
commit e5b8ec020c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.bluetooth;
import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothUuid;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -43,6 +44,7 @@ import com.android.internal.app.AlertController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfile;
import java.util.Locale; import java.util.Locale;
@@ -64,6 +66,8 @@ public final class BluetoothPairingDialog extends AlertActivity implements
private String mPairingKey; private String mPairingKey;
private EditText mPairingView; private EditText mPairingView;
private Button mOkButton; private Button mOkButton;
private LocalBluetoothProfile mPbapClientProfile;
/** /**
* Dismiss the dialog if the bond state changes to bonded or none, * Dismiss the dialog if the bond state changes to bonded or none,
@@ -109,6 +113,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements
return; return;
} }
mCachedDeviceManager = mBluetoothManager.getCachedDeviceManager(); mCachedDeviceManager = mBluetoothManager.getCachedDeviceManager();
mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR); mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
@@ -188,6 +193,9 @@ public final class BluetoothPairingDialog extends AlertActivity implements
R.id.phonebook_sharing_message_entry_pin); R.id.phonebook_sharing_message_entry_pin);
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook, contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook,
mCachedDeviceManager.getName(mDevice))); mCachedDeviceManager.getName(mDevice)));
if (mPbapClientProfile != null && mPbapClientProfile.isProfileReady()) {
contactSharing.setVisibility(View.GONE);
}
if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_ALLOWED) { if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_ALLOWED) {
contactSharing.setChecked(true); contactSharing.setChecked(true);
} else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){ } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){
@@ -261,6 +269,9 @@ public final class BluetoothPairingDialog extends AlertActivity implements
R.id.phonebook_sharing_message_confirm_pin); R.id.phonebook_sharing_message_confirm_pin);
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook, contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook,
mCachedDeviceManager.getName(mDevice))); mCachedDeviceManager.getName(mDevice)));
if (mPbapClientProfile != null && mPbapClientProfile.isProfileReady()) {
contactSharing.setVisibility(View.GONE);
}
if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_ALLOWED) { if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_ALLOWED) {
contactSharing.setChecked(true); contactSharing.setChecked(true);
} else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){ } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){