commit 4ecd8df51b4da2cc8f955cefe6a75e0a0c29a556
author Anubhav Gupta <anubhavg@codeaurora.org> Wed Jul 29 07:13:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 29 07:13:07 2015 +0000
tree 440dba8ad695fb3fbb391108ec8821809b143271
parent aab73857903d559e0e968b7604315b254c30d7e4
parent dab356e3b0573303840e63cbafb1065d57a11e2c

am dab356e3: Promote AVCTP version to 1.4

* commit 'dab356e3b0573303840e63cbafb1065d57a11e2c':
  Promote AVCTP version to 1.4

stack/avrc/avrc_sdp.c

diff --git a/stack/avrc/avrc_sdp.c b/stack/avrc/avrc_sdp.c
index f08b7c9..ba10c1c 100644
--- a/stack/avrc/avrc_sdp.c
+++ b/stack/avrc/avrc_sdp.c
@@ -31,6 +31,10 @@
 #define SDP_AVRCP_1_4      FALSE
 #endif
 
+#ifndef SDP_AVCTP_1_4
+#define SDP_AVCTP_1_4      TRUE
+#endif
+
 /*****************************************************************************
 **  Global data
 *****************************************************************************/
@@ -42,6 +46,9 @@
 const tSDP_PROTOCOL_ELEM  avrc_proto_list [] =
 {
     {UUID_PROTOCOL_L2CAP, 1, {AVCT_PSM, 0} },
+#if SDP_AVCTP_1_4 == TRUE
+    {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_4, 0}  }
+#else
 #if SDP_AVRCP_1_4 == TRUE
     {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_3, 0}  }
 #else
@@ -51,6 +58,7 @@
     {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_0, 0}  }
 #endif
 #endif
+#endif
 };
 
 #if SDP_AVRCP_1_4 == TRUE
@@ -227,6 +235,13 @@
 
     /* add service class id list */
     class_list[0] = service_uuid;
+#if SDP_AVCTP_1_4 == TRUE
+    if( service_uuid == UUID_SERVCLASS_AV_REMOTE_CONTROL )
+    {
+        class_list[1] = UUID_SERVCLASS_AV_REM_CTRL_CONTROL;
+        count = 2;
+    }
+#else
 #if SDP_AVRCP_1_4 == TRUE
     if( service_uuid == UUID_SERVCLASS_AV_REMOTE_CONTROL )
     {
@@ -234,6 +249,7 @@
         count = 2;
     }
 #endif
+#endif
     result &= SDP_AddServiceClassIdList(sdp_handle, count, class_list);
 
     /* add protocol descriptor list   */

stack/include/avct_api.h

diff --git a/stack/include/avct_api.h b/stack/include/avct_api.h
index 001ca1b..c2713fd 100644
--- a/stack/include/avct_api.h
+++ b/stack/include/avct_api.h
@@ -47,6 +47,7 @@
 #define AVCT_REV_1_0                0x0100
 #define AVCT_REV_1_2                0x0102
 #define AVCT_REV_1_3                0x0103
+#define AVCT_REV_1_4                0x0104
 
 /* the layer_specific settings */
 #define AVCT_DATA_CTRL              0x0001    /* for the control channel */