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

Commit d05e8d4e authored by Wei Wang's avatar Wei Wang Committed by Android Partner Code Review
Browse files

Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev

parents 6c850649 4a17030e

system/stack/l2cap/l2c_ble.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -630,7 +630,6 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb) 
    if (p_dev_rec->ble.active_addr_type == BTM_BLE_ADDR_RRA)

    if (p_dev_rec->ble.active_addr_type == BTM_BLE_ADDR_RRA)

    {

    {

        init_addr_type = BLE_ADDR_RANDOM;

        init_addr_type = BLE_ADDR_RANDOM;

        //memcpy(init_addr, p_dev_rec->ble.cur_rand_addr, BD_ADDR_LEN);

    }

    }

    /* if privacy is on and current do not consider using reconnection address */

    /* if privacy is on and current do not consider using reconnection address */

    if (btm_cb.ble_ctr_cb.privacy ) /* && p_dev_rec->ble.use_reconn_addr */

    if (btm_cb.ble_ctr_cb.privacy ) /* && p_dev_rec->ble.use_reconn_addr */

system/vnd/ble/vendor_ble.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -275,11 +275,6 @@ void btm_ble_vendor_irk_vsc_op_cmpl (tBTM_VSC_CMPL *p_params) 




    evt_len--;

    evt_len--;





    /*if (evt_len < 2 )

    {

        BTM_TRACE_ERROR("can not interpret IRK  VSC cmpl callback");

        return;

    }*/

    op_subcode   = *p ++;

    op_subcode   = *p ++;

    BTM_TRACE_DEBUG("btm_ble_vendor_irk_vsc_op_cmpl op_subcode = %d", op_subcode);

    BTM_TRACE_DEBUG("btm_ble_vendor_irk_vsc_op_cmpl op_subcode = %d", op_subcode);

    if (evt_len < 2 )

    if (evt_len < 2 )