commit 701c3f0fa5394a81c40fd7082bfb2a63ebebbeaa
author Jaikumar Ganesh <jaikumar@google.com> Mon Sep 13 11:50:04 2010 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Wed May 25 11:51:56 2011 -0700
tree 2d9118a1b890e1a92acd08d91bbc69e6d801d924
parent f0413ccecd644985d607577a8ed3ccc26f4777ec

Update SDP records for OPP

Android doesn't support import of iCal, vNote, vMessage, vCal
at this point. So don't advertise these formats.
Based on a report by: hyungseoung.yoo@samsung.com

Change-Id: Ifa14844570b893775c45784a31cfeb24e8fd88b1

tools/sdptool.c

diff --git a/tools/sdptool.c b/tools/sdptool.c
index 8f88a35..0f0247e 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -1749,12 +1749,11 @@
 	sdp_record_t record;
 	uint8_t chan = si->channel ? si->channel : 9;
 	sdp_data_t *channel;
-<<<<<<< HEAD
+#ifdef ANDROID
+	uint8_t formats[] = { 0x01, 0x02, 0xff };
+#else
 	uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0xff };
-=======
-	uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	//uint8_t formats[] = { 0xff };
->>>>>>> Revert "Set OPUSH SDP record supported format list to 0xff (any object type)."
+#endif
 	void *dtds[sizeof(formats)], *values[sizeof(formats)];
 	unsigned int i;
 	uint8_t dtd = SDP_UINT8;