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

Commit 591b0d01 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 18fa3d36: Merge "Changed MAP version from 1.0 to 1.1, since this is what... 

am 18fa3d36: Merge "Changed MAP version from 1.0 to 1.1, since this is what was actually implemented" into klp-dev

* commit '18fa3d36':
  Changed MAP version from 1.0 to 1.1, since this is what was actually implemented
parents 9bb80e6a 18fa3d36

system/btif/src/btif_sock_sdp.c

+10 −10
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int add_pbap_sdp(const char* p_service_name, int scn) 
#define BTA_MAP_MSG_TYPE_SMS_CDMA 0x04

#define BTA_MAP_MSG_TYPE_MMS      0x08



#define BTA_MAPS_DEFAULT_VERSION 0x0100

#define BTA_MAPS_DEFAULT_VERSION 0x0101 /* MAP 1.1 */

typedef struct

{

    UINT8       mas_id;                 /* the MAS instance id */
@@ -486,7 +486,7 @@ static int add_rfc_sdp_by_uuid(const char* name, const uint8_t* uuid, int scn) 
    }

    else if (IS_UUID(UUID_MAPS_MAS,uuid))

    {

        handle = add_maps_sdp(name, final_scn); //PBAP Server is always 19

        handle = add_maps_sdp(name, final_scn); //MAP Server is always 19

    }

    else if (IS_UUID(UUID_SPP, uuid))

    {