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

Commit 1b211979 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12L 

Bug: 222710654
Merged-In: I49488125506e6087a7b8e20152daafb116340291
Change-Id: I8507ab99b00cd5029bcde9879c1a6fc12556dd9a
parents 714973f3 67c8895e

system/btif/src/btif_hf_client.cc

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static void btif_in_hf_client_generic_evt(uint16_t event, char* p_param) { 
  btif_hf_client_cb_t* cb = btif_hf_client_get_cb_by_bda(*bd_addr);

  if (cb == NULL || !is_connected(cb)) {

    BTIF_TRACE_ERROR("%s: failed to find block for bda", __func__);

    return;

  }



  BTIF_TRACE_EVENT("%s: event=%d", __func__, event);

system/osi/src/allocator.cc

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ char* osi_strndup(const char* str, size_t len) { 
}



void* osi_malloc(size_t size) {

  CHECK(static_cast<ssize_t>(size) >= 0);

  size_t real_size = allocation_tracker_resize_for_canary(size);

  void* ptr = malloc(real_size);

  CHECK(ptr);
@@ -64,6 +65,7 @@ void* osi_malloc(size_t size) { 
}



void* osi_calloc(size_t size) {

  CHECK(static_cast<ssize_t>(size) >= 0);

  size_t real_size = allocation_tracker_resize_for_canary(size);

  void* ptr = calloc(1, real_size);

  CHECK(ptr);

system/stack/avrc/avrc_pars_tg.cc

+0 −7
Original line number Diff line number Diff line
@@ -118,13 +118,6 @@ static tAVRC_STS avrc_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg, 
  if (p_msg->vendor_len == 0) return AVRC_STS_NO_ERROR;

  if (p_msg->p_vendor_data == NULL) return AVRC_STS_INTERNAL_ERR;



  if (p_msg->vendor_len < 4) {

    android_errorWriteLog(0x534e4554, "168712382");

    AVRC_TRACE_WARNING("%s: message length %d too short: must be at least 4",

                       __func__, p_msg->vendor_len);

    return AVRC_STS_INTERNAL_ERR;

  }



  p = p_msg->p_vendor_data;

  p_result->pdu = *p++;

  AVRC_TRACE_DEBUG("%s pdu:0x%x", __func__, p_result->pdu);

system/stack/include/hci_evt_length.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static const uint8_t hci_event_parameters_minimum_length[] = { 
    10,   //  0x3B - HCI_User_Passkey_Notification Event

    7,    //  0x3C - HCI_Keypress_Notification Event

    14,   //  0x3D - HCI_Remote_Host_Supported_Features_Notification Event

    0,    //  0x3E - LE Meta event

    1,    //  0x3E - LE Meta event

    0,    //  0x3F - N/A

    2,    //  0x40 - HCI_Physical_Link_Complete Event

    1,    //  0x41 - HCI_Channel_Selected Event