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

Commit 92f2ce30 authored by Myles Watson's avatar Myles Watson Committed by Jack He
Browse files

Initialize BTM_SEC_CB connecting_dc with constant 

Use kDevClassEmpty for a device class with all zeros.

Bug: 328677864
Test: atest net_test_stack_btm
Flag: EXEMPT, no logical change
Change-Id: Ida66cc656987e427600c63739c9fae2bfce07072
parent 82e31399

system/stack/btm/btm_sec.cc

+1 −2
Original line number Diff line number Diff line
@@ -4296,8 +4296,7 @@ void btm_sec_pin_code_request(const RawAddress p_bda) { 


  /* Use the connecting device's CoD for the connection */

  if ((p_bda == p_cb->connecting_bda) &&

      (p_cb->connecting_dc[0] || p_cb->connecting_dc[1] ||

       p_cb->connecting_dc[2]))

      (p_cb->connecting_dc != kDevClassEmpty))

    p_dev_rec->dev_class = p_cb->connecting_dc;



  /* We could have started connection after asking user for the PIN code */

system/stack/btm/btm_sec_cb.cc

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void tBTM_SEC_CB::Init(uint8_t initial_security_mode) { 
  memset(&pin_code, 0, sizeof(pin_code));

  memset(sec_serv_rec, 0, sizeof(sec_serv_rec));

  connecting_bda = RawAddress::kEmpty;

  memset(&connecting_dc, 0, sizeof(connecting_dc));

  connecting_dc = kDevClassEmpty;



  sec_pending_q = fixed_queue_new(SIZE_MAX);

  sec_collision_timer = alarm_new("btm.sec_collision_timer");