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

Commit 58249f60 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log StackAclBtmAcl::btm_acl_role_changed am: 34f5bf97 am: 1664d5e0 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1539046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccc929d625adcbcd25fb23c181b24dcc2e0d7545
parents 82b84ee2 1664d5e0

system/stack/acl/btm_acl.cc

+3 −4
Original line number Diff line number Diff line
@@ -1410,8 +1410,8 @@ void StackAclBtmAcl::btm_acl_role_changed(tHCI_STATUS hci_status, 
  }



  tBTM_ROLE_SWITCH_CMPL* p_switch_role = &btm_cb.acl_cb_.switch_role_ref_data;

  LOG_DEBUG("Role change event peer:%s hci_status:%s new_role:%s",

            bd_addr.ToString().c_str(), hci_error_code_text(hci_status).c_str(),

  LOG_DEBUG("Role change event received peer:%s hci_status:%s new_role:%s",

            PRIVATE_ADDRESS(bd_addr), hci_error_code_text(hci_status).c_str(),

            RoleText(new_role).c_str());



  p_switch_role->hci_status = hci_status;
@@ -1495,8 +1495,7 @@ tBTM_STATUS StackAclBtmAcl::btm_set_packet_types(tACL_CONN* p, 
  /* Exclude packet types not supported by the peer */

  btm_acl_chk_peer_pkt_type_support(p, &temp_pkt_types);



  LOG_DEBUG("SetPacketType Mask -> 0x%04x", temp_pkt_types);



  LOG_DEBUG("Setting link packet types:0x%04x", pkt_types);

  btsnd_hcic_change_conn_type(p->hci_handle, temp_pkt_types);

  p->pkt_types_mask = temp_pkt_types;