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

Commit e3ad7183 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5339334 from 60a63513 to pi-qpr3-release 

Change-Id: I420f5037d8f471edb35b369a0cad6bc5a5728d0c
parents 522625f7 60a63513

system/btif/src/bluetooth.cc

+0 −2
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ static void dump(int fd, const char** arguments) { 
#if (BTSNOOP_MEM == TRUE)

  btif_debug_btsnoop_dump(fd);

#endif



  close(fd);

}



static void dumpMetrics(std::string* output) {

system/btif/src/btif_storage.cc

+4 −2
Original line number Diff line number Diff line
@@ -207,10 +207,12 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) { 
                            : prop->len;

      strncpy(value, (char*)prop->val, name_length);

      value[name_length] = '\0';

      if (remote_bd_addr)

      if (remote_bd_addr) {

        btif_config_set_str(bdstr, BTIF_STORAGE_PATH_REMOTE_NAME, value);

      else

      } else {

        btif_config_set_str("Adapter", BTIF_STORAGE_KEY_ADAPTER_NAME, value);

        btif_config_flush();

      }

      break;

    }

    case BT_PROPERTY_REMOTE_FRIENDLY_NAME:

system/stack/avrc/avrc_api.cc

+5 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,11 @@ uint16_t AVRC_MsgReq(uint8_t handle, uint8_t label, uint8_t ctype, 
    AVRC_CO_ID_TO_BE_STREAM(p_data, AVRC_CO_METADATA);

  } else {

    chk_frag = false;

    if (p_pkt->layer_specific == AVCT_DATA_BROWSE) {

      peer_mtu = AVCT_GetBrowseMtu(handle);

    } else {

      peer_mtu = AVCT_GetPeerMtu(handle);

    }

    if (p_pkt->len > (peer_mtu - AVCT_HDR_LEN_SINGLE)) {

      AVRC_TRACE_ERROR(

          "%s bigger than peer mtu (p_pkt->len(%d) > peer_mtu(%d-%d))",