Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Auto Pairing tweaks."

Browse Source
This commit is contained in:
Jaikumar Ganesh
2011-07-21 16:27:55 -07:00
committed by Android (Google) Code Review
parent a5e9bab0e4 8adcacbf83
commit 1352531dc7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/server/BluetoothService.java
View File

@@ -527,10 +527,19 @@ public class BluetoothService extends IBluetooth.Stub {
break;
case MESSAGE_AUTO_PAIRING_FAILURE_ATTEMPT_DELAY:
address = (String)msg.obj;
if (address != null) {
if (address == null) return;
int attempt = mBondState.getAttempt(address);
// Try only if attemps are in progress and cap it 2 attempts
// The 2 attempts cap is a fail safe if the stack returns
// an incorrect error code for bonding failures and if the pin
// is entered wrongly twice we should abort.
if (attempt > 0 && attempt <= 2) {
mBondState.attempt(address);
createBond(address);
return;
}
if (attempt > 0) mBondState.clearPinAttempts(address);
break;
}
}
@@ -741,7 +750,6 @@ public class BluetoothService extends IBluetooth.Stub {
BluetoothDevice.BOND_NONE, result);
return;
}
mBondState.attempt(address);
}
/*package*/ BluetoothDevice getRemoteDevice(String address) {