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

Commit 5ef52a01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Print errors if acceptlist events are too small" am: 63205b58 am:... 

Merge "Print errors if acceptlist events are too small" am: 63205b58 am: 33edeec7 am: 20ef4f68

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

Change-Id: Ic5e7e3540f6231b9252002ea3d13ea78d832118c
parents 0cd0ee2e 20ef4f68

system/stack/btm/btm_ble_bgconn.cc

+17 −18
Original line number Diff line number Diff line
@@ -90,38 +90,37 @@ static void acceptlist_command_complete(tHCI_STATUS status, const char* msg) { 
}



static void acceptlist_add_command_complete(uint8_t* p_data, uint16_t evt_len) {

  if (evt_len > sizeof(uint8_t)) {

    uint8_t status;

    STREAM_TO_UINT8(status, p_data);

    acceptlist_command_complete(static_cast<tHCI_STATUS>(status),

                                kAcceptlistAdd);

  } else {

  if (evt_len < sizeof(uint8_t)) {

    LOG_ERROR("Received bogus acceptlist add complete length:%hu", evt_len);

    return;

  }

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  acceptlist_command_complete(static_cast<tHCI_STATUS>(status), kAcceptlistAdd);

}



static void acceptlist_remove_command_complete(uint8_t* p_data,

                                               uint16_t evt_len) {

  if (evt_len > sizeof(uint8_t)) {

  if (evt_len < sizeof(uint8_t)) {

    LOG_ERROR("Received bogus acceptlist remove complete length:%hu", evt_len);

    return;

  }

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  acceptlist_command_complete(static_cast<tHCI_STATUS>(status),

                              kAcceptlistRemove);

  } else {

    LOG_ERROR("Received bogus acceptlist remove complete length:%hu", evt_len);

  }

}



static void acceptlist_clear_command_complete(uint8_t* p_data,

                                              uint16_t evt_len) {

  if (evt_len > sizeof(uint8_t)) {

  if (evt_len < sizeof(uint8_t)) {

    LOG_ERROR("Received bogus acceptlist remove complete length:%hu", evt_len);

    return;

  }

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  acceptlist_command_complete(static_cast<tHCI_STATUS>(status),

                              kAcceptlistClear);

  } else {

    LOG_ERROR("Received bogus acceptlist remove complete length:%hu", evt_len);

  }

}



/** This function is to stop auto connection procedure */