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

Commit 9ff407b1 authored by Matthew Xie's avatar Matthew Xie Committed by Simon Wilson
Browse files

DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 

AVDTP SPEC 1.3 set sig_id in gerneral reject message. But current stack
is on AVDTP 1.2, we need set the field to be 0.
Setting sig_id would fail PTS test TP/SIG/SMG/BI-28-C

Bug: 17892440
Change-Id: I2037aae299eab15864fc7b53ada7f49c0f34b9c5
parent 5fd02b54

system/stack/avdt/avdt_msg.c

+3 −4
Original line number Diff line number Diff line
@@ -1654,6 +1654,7 @@ void avdt_msg_send_grej(tAVDT_CCB *p_ccb, UINT8 sig_id, tAVDT_MSG *p_params) 
    BT_HDR      *p_buf;

    UINT8       *p;

    UINT8       *p_start;

    UNUSED(sig_id);



    /* get a buffer */

    p_buf = (BT_HDR *) GKI_getpoolbuf(AVDT_CMD_POOL_ID);
@@ -1666,11 +1667,9 @@ void avdt_msg_send_grej(tAVDT_CCB *p_ccb, UINT8 sig_id, tAVDT_MSG *p_params) 
    /* calculate length */

    p_buf->len = (UINT16) (p - p_start);



    /* stash sig, label, and message type in buf */

    p_buf->event = sig_id;

    /* stash label, and message type in buf */

    AVDT_BLD_LAYERSPEC(p_buf->layer_specific, AVDT_MSG_TYPE_GRJ, p_params->hdr.label);

    //p_buf->event = 0;

    //AVDT_BLD_LAYERSPEC(p_buf->layer_specific, 0, p_params->hdr.label);

    p_buf->event = 0;

    AVDT_TRACE_DEBUG0("avdt_msg_send_grej");



    /* queue message and trigger ccb to send it */