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

Commit f8f39b8a authored by Fei Zheng's avatar Fei Zheng Committed by Myles Watson
Browse files

Use Bluetooth UUID definitions of header file 

Remove the Bluetooth UUID definitions from bta_sdp_act.cc and use the
definitions in btif_sock_sdp.h

Bug: 141666056
Test: atest net_test_bta
Sponsor: alainv@
Tag: #feature

Change-Id: I95b61969ef28711b11739d97315500ffd7fd95b9
parent a6d4be1e

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);