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

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

Merge changes from topic "dip1.3" am: af3de085 am: e69cfe86 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcc4afd24b01e37dd815ea9d7d679702e8872e51
parents d15f1ef6 e69cfe86

system/bta/sdp/bta_sdp_act.cc

+1 −11
Original line number Diff line number Diff line
@@ -28,20 +28,10 @@ 
#include "bta_sdp_api.h"

#include "bta_sdp_int.h"

#include "bta_sys.h"

#include "btif_sock_sdp.h"

#include "osi/include/allocator.h"

#include "sdp_api.h"



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

 *  Constants

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



static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From16Bit(0x1105);

static const Uuid UUID_PBAP_PSE = Uuid::From16Bit(0x112F);

static const Uuid UUID_MAP_MAS = Uuid::From16Bit(0x1132);

static const Uuid UUID_MAP_MNS = Uuid::From16Bit(0x1133);

static const Uuid UUID_SAP = Uuid::From16Bit(0x112D);

static const Uuid UUID_DIP = Uuid::From16Bit(0x1200);



static void bta_create_mns_sdp_record(bluetooth_sdp_record* record,

                                      tSDP_DISC_REC* p_rec) {

  tSDP_DISC_ATTR* p_attr;

system/btif/include/btif_sock_sdp.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static const bluetooth::Uuid UUID_MAP_MAS = bluetooth::Uuid::From16Bit(0x1132); 
static const bluetooth::Uuid UUID_SAP = bluetooth::Uuid::From16Bit(0x112D);

static const bluetooth::Uuid UUID_SPP = bluetooth::Uuid::From16Bit(0x1101);

static const bluetooth::Uuid UUID_DIP = bluetooth::Uuid::From16Bit(0x1200);

static const bluetooth::Uuid UUID_MAP_MNS = bluetooth::Uuid::From16Bit(0x1133);



int add_rfc_sdp_rec(const char* name, bluetooth::Uuid uuid, int scn);

void del_rfc_sdp_rec(int handle);