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

Commit 852047ba authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap shim: fix L2CA_SendFixedChnlData am: 298c5d45 am: 9103476b am: 4a3e4d8b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf336f5d40e992bba1fb3024c53ae05241a6644f
parents 1eea5fe9 4a3e4d8b

system/main/shim/l2c_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -799,14 +799,14 @@ uint16_t L2CA_SendFixedChnlData(uint16_t cid, const RawAddress& rem_bda, 
                                BT_HDR* p_buf) {

  if (cid != kAttCid && cid != kSmpCid) {

    LOG(ERROR) << "Invalid cid " << cid;

    return false;

    return L2CAP_DW_FAILED;

  }

  auto* helper = &le_fixed_channel_helper_.find(cid)->second;

  auto remote = ToAddressWithType(rem_bda, Btm::GetAddressType(rem_bda));

  auto len = p_buf->len;

  auto* data = p_buf->data + p_buf->offset;

  bool sent = helper->send(remote, MakeUniquePacket(data, len));

  return sent ? len : 0;

  return sent ? L2CAP_DW_SUCCESS : L2CAP_DW_FAILED;

}



bool L2CA_RemoveFixedChnl(uint16_t cid, const RawAddress& rem_bda) {