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

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

Merge "legacy: Re-include stack/sdp" am: bce70ca7 am: 9efec4a1 am: b7692404 

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

Change-Id: Ia4a1ff8cf9e460733864a41f0629e172198eaa55
parents a75f9aa4 b7692404

system/stack/sdp/sdp_api.cc

+7 −5
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ 


#include <string.h>



#include "bt_target.h"



#include "sdp_api.h"

#include "sdpint.h"

#include <cstdint>



#include "osi/include/osi.h"

#include "bt_target.h"

#include "osi/include/osi.h"  // PTR_TO_UINT

#include "stack/include/sdp_api.h"

#include "stack/sdp/sdpint.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



using bluetooth::Uuid;

system/stack/sdp/sdp_db.cc

+6 −6
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ 
 *

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



#include <stdio.h>

#include <string.h>



#include "bt_target.h"



#include "bt_common.h"

#include <cstdint>



#include "sdp_api.h"

#include "sdpint.h"

#include "bt_target.h"

#include "osi/include/allocator.h"

#include "stack/include/sdp_api.h"

#include "stack/include/sdpdefs.h"

#include "stack/sdp/sdpint.h"



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

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

system/stack/sdp/sdp_discovery.cc

+7 −11
Original line number Diff line number Diff line
@@ -24,20 +24,16 @@ 


#define LOG_TAG "sdp_discovery"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <cstdint>



#include "bt_common.h"

#include "bt_target.h"

#include "btm_api.h"

#include "btu.h"

#include "hcidefs.h"

#include "hcimsgs.h"

#include "l2cdefs.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "sdp_api.h"

#include "sdpint.h"

#include "stack/include/bt_types.h"

#include "stack/include/sdp_api.h"

#include "stack/include/sdpdefs.h"

#include "stack/sdp/sdpint.h"

#include "types/bluetooth/uuid.h"



using bluetooth::Uuid;

system/stack/sdp/sdp_main.cc

+9 −13
Original line number Diff line number Diff line
@@ -22,19 +22,15 @@ 
 *

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



#include <string.h>



#include "bt_common.h"

#include "bt_target.h"

#include "hcidefs.h"



#include "l2c_api.h"

#include "l2cdefs.h"

#include "osi/include/osi.h"



#include "sdp_api.h"

#include "sdpint.h"

#include "stack/btm/btm_sec.h"

#include <string.h>  // memset



#include "osi/include/allocator.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/btm_api_types.h"

#include "stack/include/l2c_api.h"

#include "stack/include/sdp_api.h"

#include "stack/sdp/sdpint.h"

#include "types/raw_address.h"



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

/*                     G L O B A L      S D P       D A T A                   */

system/stack/sdp/sdp_server.cc

+7 −7
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ 
 *

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



#include <string.h>

#include <string.h>  // memcpy



#include "bt_common.h"

#include <log/log.h>

#include <cstdint>



#include "avrc_defs.h"

#include "device/include/interop.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "sdp_api.h"

#include "sdpint.h"

#include "osi/include/allocator.h"

#include "stack/include/avrc_defs.h"

#include "stack/include/sdp_api.h"

#include "stack/sdp/sdpint.h"



/* Maximum number of bytes to reserve out of SDP MTU for response data */

#define SDP_MAX_SERVICE_RSPHDR_LEN 12