HID: Accept the incoming connection in bonding state also
During reconnection bond state may moved to bonding if remote missed key due to collision
Also stack accepts the connection after authentication complete.
Hence allow the connection in bonding and bonded states
BUG:146908993
Change-Id: Ib5c3e01f814a4432124f04e0617aa9615a3e96fe
CRs-Fixed: 2585102
diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android/bluetooth/hid/HidHostService.java
index 81046a2..bbde619 100644
--- a/src/com/android/bluetooth/hid/HidHostService.java
+++ b/src/com/android/bluetooth/hid/HidHostService.java
@@ -818,9 +818,10 @@
// Check priority and accept or reject the connection.
int priority = getPriority(device);
int bondState = adapterService.getBondState(device);
- // Allow this connection only if the device is bonded. Any attempt to connect while
- // bonding would potentially lead to an unauthorized connection.
- if (bondState != BluetoothDevice.BOND_BONDED) {
+ // During reconnection bond state may moved to bonding if remote missed key due to collision
+ // Also stack accepts the connection after authentication complete.
+ // Allow the connection in bonding and bonded states
+ if (bondState == BluetoothDevice.BOND_NONE) {
Log.w(TAG, "okToConnect: return false, bondState=" + bondState);
return false;
} else if (priority != BluetoothProfile.PRIORITY_UNDEFINED