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

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

Merge changes I282fc94d,I3fdac96c am: e24f7ee0 

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

Change-Id: If1a4c404673909fd1e3f5d41aae1e122aa5fbac8
parents 7d51b370 e24f7ee0

system/bta/sdp/bta_sdp_act.cc

+0 −7
Original line number Diff line number Diff line
@@ -20,23 +20,16 @@ 
 *  This file contains action functions for SDP search.

 ******************************************************************************/



#include <arpa/inet.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_sdp.h>

#include <stdlib.h>

#include <string.h>



#include "bt_common.h"

#include "bt_types.h"

#include "bta_api.h"

#include "bta_sdp_api.h"

#include "bta_sdp_int.h"

#include "bta_sys.h"

#include "btm_api.h"

#include "btm_int.h"

#include "osi/include/allocator.h"

#include "sdp_api.h"

#include "utl.h"



/*****************************************************************************

 *  Constants

system/btif/src/btif_sock_rfc.cc

+0 −8
Original line number Diff line number Diff line
@@ -36,26 +36,18 @@ 


#include "bt_common.h"

#include "bt_target.h"

#include "bta_api.h"

#include "bta_jv_api.h"

#include "bta_jv_co.h"

#include "btif_common.h"

#include "btif_sock_sdp.h"

#include "btif_sock_thread.h"

#include "btif_sock_util.h"

#include "btif_uid.h"

#include "btif_util.h"

#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include "common/metrics.h"

#include "hcimsgs.h"

#include "osi/include/compat.h"

#include "osi/include/list.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "port_api.h"

#include "sdp_api.h"



/* The JV interface can have only one user, hence we need to call a few

 * L2CAP functions from this file. */

system/btif/src/btif_sock_sdp.cc

+2 −15
Original line number Diff line number Diff line
@@ -20,26 +20,13 @@ 


#include "btif_sock_sdp.h"



#include <errno.h>

#include <sys/socket.h>

#include <sys/types.h>



#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>



#include "../bta/pb/bta_pbs_int.h"

#include "../include/bta_op_api.h"

#include "bt_common.h"

#include "bt_target.h"

#include "bta_api.h"

#include "bta/pb/bta_pbs_int.h"

#include "bta_jv_api.h"

#include "btif_common.h"

#include "bta_op_api.h"

#include "btif_sock_util.h"

#include "btif_util.h"

#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include "hcimsgs.h"

#include "sdp_api.h"

#include "utl.h"

system/btif/src/btif_sock_util.cc

+1 −13
Original line number Diff line number Diff line
@@ -36,22 +36,10 @@ 
#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>



#include "bt_common.h"

#include "bt_target.h"

#include "bta_api.h"

#include "bta_jv_api.h"

#include "bta_jv_co.h"

#include "btif_common.h"

#include "btif_sock_sdp.h"

#include "btif_sock_thread.h"

#include "btif_util.h"

#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include "hcimsgs.h"

#include "osi/include/log.h"

#include "port_api.h"

#include "sdp_api.h"

#include "osi/include/osi.h"



#define asrt(s)                                                              \

  do {                                                                       \

system/stack/acl/btm_acl.cc

+3 −3
Original line number Diff line number Diff line
@@ -1619,17 +1619,17 @@ tBTM_STATUS btm_set_packet_types(tACL_CONN* p, uint16_t pkt_types) { 


/*******************************************************************************

 *

 * Function         btm_get_max_packet_size

 * Function         BTM_GetMaxPacketSize

 *

 * Returns          Returns maximum packet size that can be used for current

 *                  connection, 0 if connection is not established

 *

 ******************************************************************************/

uint16_t btm_get_max_packet_size(const RawAddress& addr) {

uint16_t BTM_GetMaxPacketSize(const RawAddress& addr) {

  tACL_CONN* p = btm_bda_to_acl(addr, BT_TRANSPORT_BR_EDR);

  uint16_t pkt_types = 0;

  uint16_t pkt_size = 0;

  BTM_TRACE_DEBUG("btm_get_max_packet_size");

  BTM_TRACE_DEBUG("BTM_GetMaxPacketSize");

  if (p != NULL) {

    pkt_types = p->pkt_types_mask;

  } else {