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

Commit 05587a54 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android (Google) Code Review
Browse files

Merge "A typo to set wrong max connection interval value when we create a BLE... 

Merge "A typo to set wrong max connection interval value when we create a BLE connection." into klp-dev
parents 16bc27b6 6e96ee3f

system/stack/l2cap/l2c_ble.c

+8 −4
Original line number Diff line number Diff line
@@ -554,10 +554,14 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb) 
                                        init_addr_type,          /* UINT8 addr_type_peer */

                                        init_addr,               /* BD_ADDR bda_peer     */

                                        own_addr_type,         /* UINT8 addr_type_own  */

                                        (UINT16) ((p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ? p_dev_rec->conn_params.min_conn_int : BTM_BLE_CONN_INT_MIN),  /* UINT16 conn_int_min  */

                                        (UINT16) ((p_dev_rec->conn_params.max_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ? p_dev_rec->conn_params.max_conn_int : BTM_BLE_CONN_INT_MIN),  /* UINT16 conn_int_max  */

                                        (UINT16) ((p_dev_rec->conn_params.slave_latency != BTM_BLE_CONN_PARAM_UNDEF) ? p_dev_rec->conn_params.slave_latency : 0), /* UINT16 conn_latency  */

                                        (UINT16) ((p_dev_rec->conn_params.supervision_tout != BTM_BLE_CONN_PARAM_UNDEF) ? p_dev_rec->conn_params.supervision_tout : BTM_BLE_CONN_SUP_TOUT_DEF), /* UINT16 conn_timeout  */

        (UINT16) ((p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ?

        p_dev_rec->conn_params.min_conn_int : BTM_BLE_CONN_INT_MIN_DEF),  /* conn_int_min  */

        (UINT16) ((p_dev_rec->conn_params.max_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ?

        p_dev_rec->conn_params.max_conn_int : BTM_BLE_CONN_INT_MAX_DEF),  /* conn_int_max  */

        (UINT16) ((p_dev_rec->conn_params.slave_latency != BTM_BLE_CONN_PARAM_UNDEF) ?

        p_dev_rec->conn_params.slave_latency : 0), /* UINT16 conn_latency  */

        (UINT16) ((p_dev_rec->conn_params.supervision_tout != BTM_BLE_CONN_PARAM_UNDEF) ?

        p_dev_rec->conn_params.supervision_tout : BTM_BLE_CONN_SUP_TOUT_DEF), /* conn_timeout */

                                        0,                       /* UINT16 min_len       */

                                        0))                      /* UINT16 max_len       */

    {