Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e031859 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Fix build after cross-key issues broke non privacy enabled builds 

Change-Id: Idef7239b07115be9290d7cca6610c603ffb3afa5
parent b9e695f3

system/stack/btm/btm_ble.c

+6 −0
Original line number Diff line number Diff line
@@ -1873,11 +1873,15 @@ void btm_ble_conn_complete(UINT8 *p, UINT16 evt_len, BOOLEAN enhanced) 
        if (status != HCI_ERR_DIRECTED_ADVERTISING_TIMEOUT)

        {

            btm_ble_set_conn_st(BLE_CONN_IDLE);

#if (defined BLE_PRIVACY_SPT && BLE_PRIVACY_SPT == TRUE)

            btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, TRUE);

#endif

        }

        else

        {

#if (defined BLE_PRIVACY_SPT && BLE_PRIVACY_SPT == TRUE)

            btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);

#endif

        }

    }
@@ -2408,11 +2412,13 @@ static void btm_ble_process_irk(tSMP_ENC *p) 
        memcpy(btm_cb.devcb.id_keys.irk, p->param_buf, BT_OCTET16_LEN);

        btm_notify_new_key(BTM_BLE_KEY_TYPE_ID);



#if BLE_PRIVACY_SPT == TRUE

        /* if privacy is enabled, new RPA should be calculated */

        if (btm_cb.ble_ctr_cb.privacy_mode != BTM_PRIVACY_NONE)

        {

            btm_gen_resolvable_private_addr((void *)btm_gen_resolve_paddr_low);

        }

#endif

    }

    else

    {

system/stack/btm/btm_ble_bgconn.c

+2 −0
Original line number Diff line number Diff line
@@ -399,11 +399,13 @@ BOOLEAN btm_ble_start_auto_conn(BOOLEAN start) 
            scan_win = (p_cb->scan_win == BTM_BLE_SCAN_PARAM_UNDEF) ?

                                          BTM_BLE_SCAN_SLOW_WIN_1 : p_cb->scan_win;



#if BLE_PRIVACY_SPT == TRUE

            if (btm_cb.ble_ctr_cb.rl_state != BTM_BLE_RL_IDLE)

            {

                own_addr_type |= BLE_ADDR_TYPE_ID_BIT;

                peer_addr_type |= BLE_ADDR_TYPE_ID_BIT;

            }

#endif



            if (!btsnd_hcic_ble_create_ll_conn (scan_int,  /* UINT16 scan_int      */

                                                scan_win,    /* UINT16 scan_win      */

system/stack/btm/btm_ble_gap.c

+6 −0
Original line number Diff line number Diff line
@@ -473,7 +473,9 @@ tBTM_STATUS BTM_BleBroadcast(BOOLEAN start) 
    else if (!start)

    {

        status = btm_ble_stop_adv();

#if BLE_PRIVACY_SPT == TRUE

        btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);

#endif

    }

    else

    {
@@ -1772,7 +1774,9 @@ tBTM_STATUS btm_ble_set_discoverability(UINT16 combined_mode) 
    }

    else

    {

#if BLE_PRIVACY_SPT == TRUE

        btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);

#endif

    }



    /* set up stop advertising timer */
@@ -1872,7 +1876,9 @@ tBTM_STATUS btm_ble_set_connectability(UINT16 combined_mode) 
    }

    else

    {

#if BLE_PRIVACY_SPT == TRUE

        btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);

#endif

    }

    return status;

}

system/stack/l2cap/l2c_ble.c

+4 −0
Original line number Diff line number Diff line
@@ -353,7 +353,9 @@ void l2cble_scanner_conn_comp (UINT16 handle, BD_ADDR bda, tBLE_ADDR_TYPE type, 


    btm_ble_set_conn_st(BLE_CONN_IDLE);



#if BLE_PRIVACY_SPT == TRUE

    btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, TRUE);

#endif

}
@@ -420,7 +422,9 @@ void l2cble_advertiser_conn_comp (UINT16 handle, BD_ADDR bda, tBLE_ADDR_TYPE typ 


    btm_acl_created (bda, NULL, p_dev_rec->sec_bd_name, handle, p_lcb->link_role, BT_TRANSPORT_LE);



#if BLE_PRIVACY_SPT == TRUE

    btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);

#endif



    p_lcb->peer_chnl_mask[0] = L2CAP_FIXED_CHNL_ATT_BIT | L2CAP_FIXED_CHNL_BLE_SIG_BIT | L2CAP_FIXED_CHNL_SMP_BIT;