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

Commit e29c85bd authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge "SCO: Don't assert a valid handle when status != success" into main

parents 42344c2b 564c4ce8

system/stack/btu/btu_hcif.cc

+4 −5
Original line number Diff line number Diff line
@@ -856,13 +856,12 @@ static void btu_hcif_esco_connection_comp_evt(const uint8_t* p) { 
  STREAM_SKIP_UINT8(p);   // air_mode



  handle = HCID_GET_HANDLE(handle);

  data.bd_addr = bda;

  if (status == HCI_SUCCESS) {

    log::assert_that(handle <= HCI_HANDLE_MAX,

                     "Received eSCO connection complete event with invalid "

                     "handle: 0x{:X} that should be <= 0x{:X}",

                     handle, HCI_HANDLE_MAX);



  data.bd_addr = bda;

  if (status == HCI_SUCCESS) {

    btm_sco_connected(bda, handle, &data);

  } else {

    btm_sco_connection_failed(static_cast<tHCI_STATUS>(status), bda, handle,