am b3c61229: Merge "Code cleanup - remove unnecessary commented out code" into klp...

* commit 'b3c61229ccf38ea3f398f93902d348ba12a7fb07':
  Code cleanup - remove unnecessary commented out code

diff --combined stack/l2cap/l2c_ble.c
index b46a1c8,c958625..3c2df02
--- 1/stack/l2cap/l2c_ble.c
--- 2/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@@ -630,7 -630,6 +630,6 @@@ BOOLEAN l2cble_init_direct_conn (tL2C_L
      if (p_dev_rec->ble.active_addr_type == BTM_BLE_ADDR_RRA)
      {
          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 (btm_cb.ble_ctr_cb.privacy ) /* && p_dev_rec->ble.use_reconn_addr */
@@@ -644,7 -643,7 +643,7 @@@
          return FALSE;
      }
  #if BLE_PRIVACY_SPT == TRUE
 -#if (defined BLE_VND_INCLUDED || BLE_VND_INCLUDED == TRUE)
 +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE)
      extern tBTM_STATUS BTM_BleEnableIRKFeature(BOOLEAN enable);
      if (btm_ble_vendor_irk_list_load_dev(p_dev_rec))
          BTM_BleEnableIRKFeature(TRUE);
@@@ -663,9 -662,9 +662,9 @@@
          (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  */
 +        p_dev_rec->conn_params.slave_latency : BTM_BLE_CONN_SLAVE_LATENCY_DEF), /* 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 */
 +        p_dev_rec->conn_params.supervision_tout : BTM_BLE_CONN_TIMEOUT_DEF), /* conn_timeout */
                                          0,                       /* UINT16 min_len       */
                                          0))                      /* UINT16 max_len       */
      {

diff --combined vnd/ble/vendor_ble.c
index 08ff1c0,d7eea43..e00d5e2
--- 1/vnd/ble/vendor_ble.c
--- 2/vnd/ble/vendor_ble.c
+++ b/vnd/ble/vendor_ble.c
@@@ -275,11 -275,6 +275,6 @@@ void btm_ble_vendor_irk_vsc_op_cmpl (tB
  
      evt_len--;
  
-     /*if (evt_len < 2 )
-     {
-         BTM_TRACE_ERROR("can not interpret IRK  VSC cmpl callback");
-         return;
-     }*/
      op_subcode   = *p ++;
      BTM_TRACE_DEBUG("btm_ble_vendor_irk_vsc_op_cmpl op_subcode = %d", op_subcode);
      if (evt_len < 2 )
@@@ -355,9 -350,7 +350,9 @@@
              STREAM_TO_BDADDR(target_bda, p);
              STREAM_TO_BDADDR(rra, p);
  
 +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE)
              btm_ble_refresh_rra(target_bda, rra);
 +#endif
          }
      }