Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on
we should use the same role as the previous connection, if phone walk out of range,
and reconnect back from remote device.
bug:10648781
Change-Id: I6abd77067d26769067ba2fbd45d9e8f75cf7c764
diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c
index ea1c68e..8310ae1 100644
--- a/stack/btm/btm_acl.c
+++ b/stack/btm/btm_acl.c
@@ -49,6 +49,52 @@
/*******************************************************************************
**
+** Function btm_save_remote_device_role
+**
+** Description This function is to save remote device role
+**
+** Returns void
+**
+*******************************************************************************/
+static void btm_save_remote_device_role(BD_ADDR bd_addr, UINT8 role)
+{
+ UINT8 i, j;
+ if (role == BTM_ROLE_UNDEFINED) return;
+
+ for (i = 0; i < BTM_ROLE_DEVICE_NUM; i++) {
+ if ((btm_cb.previous_connected_role[i] != BTM_ROLE_UNDEFINED) &&
+ (!bdcmp(bd_addr, btm_cb.previous_connected_remote_addr[i]))) {
+ break;
+ }
+ }
+
+ if (i < BTM_ROLE_DEVICE_NUM) {
+ UINT8 end;
+ if (i < btm_cb.front) {
+ for (j = i; j > 0; j--) {
+ bdcpy(btm_cb.previous_connected_remote_addr[j],
+ btm_cb.previous_connected_remote_addr[j-1]);
+ }
+ bdcpy(btm_cb.previous_connected_remote_addr[0],
+ btm_cb.previous_connected_remote_addr[BTM_ROLE_DEVICE_NUM-1]);
+ end = BTM_ROLE_DEVICE_NUM-1;
+ } else {
+ end = i;
+ }
+
+ for (j = end; j > btm_cb.front; j--) {
+ bdcpy(btm_cb.previous_connected_remote_addr[j],
+ btm_cb.previous_connected_remote_addr[j-1]);
+ }
+ }
+
+ bdcpy(btm_cb.previous_connected_remote_addr[btm_cb.front], bd_addr);
+ btm_cb.previous_connected_role[btm_cb.front] = role;
+ btm_cb.front = (btm_cb.front + 1) % BTM_ROLE_DEVICE_NUM;
+}
+
+/*******************************************************************************
+**
** Function btm_acl_init
**
** Description This function is called at BTM startup to initialize
@@ -158,6 +204,7 @@
{
p->hci_handle = hci_handle;
p->link_role = link_role;
+ btm_save_remote_device_role(bda, link_role);
#if BLE_INCLUDED == TRUE
p->is_le_link = is_le_link;
#endif
@@ -175,6 +222,7 @@
p->in_use = TRUE;
p->hci_handle = hci_handle;
p->link_role = link_role;
+ btm_save_remote_device_role(bda, link_role);
p->link_up_issued = FALSE;
#if BLE_INCLUDED == TRUE
@@ -2194,7 +2242,7 @@
/* Update cached value */
p->link_role = new_role;
-
+ btm_save_remote_device_role(p_bda, new_role);
/* Reload LSTO: link supervision timeout is reset in the LM after a role switch */
if (new_role == BTM_ROLE_MASTER)
{