AI 143116: Added separate error messages for Bluetooth bonding rejections
and bonding failures due to down devices BUG=1308546 Automated import of CL 143116
This commit is contained in:

committed by
The Android Open Source Project
parent
60af953bda
commit
a322045d92
@@ -181,10 +181,22 @@ public class LocalBluetoothDeviceManager {
|
||||
* BluetoothDevice.UNBOND_REASON_*
|
||||
*/
|
||||
public synchronized void onBondingError(String address, int reason) {
|
||||
mLocalManager.showError(address, R.string.bluetooth_error_title,
|
||||
(reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED) ?
|
||||
R.string.bluetooth_pairing_pin_error_message :
|
||||
R.string.bluetooth_pairing_error_message);
|
||||
int errorMsg;
|
||||
|
||||
switch(reason) {
|
||||
case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
|
||||
errorMsg = R.string.bluetooth_pairing_pin_error_message;
|
||||
break;
|
||||
case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
|
||||
errorMsg = R.string.bluetooth_pairing_rejected_error_message;
|
||||
break;
|
||||
case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
|
||||
errorMsg = R.string.bluetooth_pairing_device_down_error_message;
|
||||
break;
|
||||
default:
|
||||
errorMsg = R.string.bluetooth_pairing_error_message;
|
||||
}
|
||||
mLocalManager.showError(address, R.string.bluetooth_error_title, errorMsg);
|
||||
}
|
||||
|
||||
public synchronized void onProfileStateChanged(String address, boolean transientState) {
|
||||
|
Reference in New Issue
Block a user