diff options
| author | Anubhav Gupta <anubhavg@codeaurora.org> | 2015-07-28 12:02:57 +0530 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-07-28 23:54:26 -0700 |
| commit | dab356e3b0573303840e63cbafb1065d57a11e2c (patch) | |
| tree | 2dac3d91ff70eaeefb7f1ab545fb772c3633f0b7 /stack/avrc | |
| parent | 2ac9ae06be5091f6f2eef0022a3810752f127d04 (diff) | |
| download | android_system_bt-dab356e3b0573303840e63cbafb1065d57a11e2c.tar.gz android_system_bt-dab356e3b0573303840e63cbafb1065d57a11e2c.tar.bz2 android_system_bt-dab356e3b0573303840e63cbafb1065d57a11e2c.zip | |
Promote AVCTP version to 1.4
Promoting AVCTP version to 1.4 from 1.2 as Bluedroid stack
already has got support for the same.
Below changes are incorporated as part of this:
- AVCTP version in SDP entry is upgraded to 1.4 for both AVRCP
Target and controller role.
- Service class #1 is added in extra for AVRCP Controller SDP
entry to be in sync with AVCTP version change.
- Browsing support is not enabled as that needs corresponding
profile level implementation, which is currently unavailable.
Change-Id: I72f7f67eb0a789fd321e9468f2a51bb5e9385a89
Diffstat (limited to 'stack/avrc')
| -rw-r--r-- | stack/avrc/avrc_sdp.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/stack/avrc/avrc_sdp.c b/stack/avrc/avrc_sdp.c index f08b7c907..ba10c1c5a 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 @@ tAVRC_CB avrc_cb; 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 @@ const tSDP_PROTOCOL_ELEM avrc_proto_list [] = {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_0, 0} } #endif #endif +#endif }; #if SDP_AVRCP_1_4 == TRUE @@ -227,6 +235,13 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, /* 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 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, count = 2; } #endif +#endif result &= SDP_AddServiceClassIdList(sdp_handle, count, class_list); /* add protocol descriptor list */ |