Commit: 41d651a95ad63519e28f23f39a5c31c2dd0c8574 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 41d651a95ad63519e28f23f39a5c31c2dd0c8574 (tree)
• Zeit: 2013-10-10 06:20:56
• Autor: Matthew Xie <mattx@goog...>
• Commiter: Matthew Xie

Log Message

Remove MMS support from MAP SDP

When we support MMS in the future. Revert this patch.
bug 10296324

Change-Id: I9d65895d6cb55b3967efcddc2c37b3f95ba3ce38

Ändern Zusammenfassung

• modified: btif/src/btif_sock_sdp.c

Diff

--- a/btif/src/btif_sock_sdp.c
+++ b/btif/src/btif_sock_sdp.c
@@ -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);