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

Commit 6d6d8055 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 3b561da0: Merge "Remove MMS support from MAP SDP" into klp-dev

* commit '3b561da0':
  Remove MMS support from MAP SDP
parents 0e547ff0 3b561da0
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -225,11 +225,11 @@ typedef struct
    const char* service_name;          /* Description of the MAS instance */
    UINT8       supported_message_types;/* Server supported message types - SMS/MMS/EMAIL */
} tBTA_MAPS_CFG;
const tBTA_MAPS_CFG bta_maps_cfg_sms_mms =
const tBTA_MAPS_CFG bta_maps_cfg_sms =
{
    0,                  /* Mas id 0 is for SMS/MMS */
    "MAP SMS/MMS",
    BTA_MAP_MSG_TYPE_SMS_GSM | BTA_MAP_MSG_TYPE_SMS_CDMA | BTA_MAP_MSG_TYPE_MMS
    "MAP SMS",
    BTA_MAP_MSG_TYPE_SMS_GSM | BTA_MAP_MSG_TYPE_SMS_CDMA
};
const tBTA_MAPS_CFG bta_maps_cfg_email =
{
@@ -246,7 +246,7 @@ static int add_maps_sdp(const char* p_service_name, int scn)
    BOOLEAN             status = FALSE;
    UINT32              sdp_handle = 0;
    // TODO: To add support for EMAIL set below depending on the scn to either SMS or Email
    const tBTA_MAPS_CFG *p_bta_maps_cfg = &bta_maps_cfg_sms_mms;
    const tBTA_MAPS_CFG *p_bta_maps_cfg = &bta_maps_cfg_sms;

    APPL_TRACE_DEBUG2("add_maps_sdd:scn %d, service name %s", scn, p_service_name);