From: JivakDhadse <jdhads@codeaurora.org>
Date: Fri, 7 Aug 2015 13:28:38 +0000 (+0530)
Subject: Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
X-Git-Tag: android-x86-8.1-r1~772
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=029e08d1cbe8cfae7ef982713a7818fc67732f2d;p=android-x86%2Fsystem-bt.git

Revert "DO NOT MERGE Proper construction of AVDTP general reject message"

This reverts commit 2ed10d442266eade44be121cd24fd473c85007d0.

Original change needs to be reverted to align with Errata
ESR04 where "Section 8.17, General Reject Page 71" of adopted
AvDTP Spec is changed to have "Invalid Signal Identifier"
in first 6 bits of Octet 1.
This change helps passing PTS case TP/SIG/SMG/ESR04/BI-28-C

Bug: 27852645
Change-Id: Idfc960ce00662e8aacc26f3b3fdca9deca8a2aff
(cherry picked from commit 825cd49864f7338be8b33f901ddf3be8e1bab7c1)
---

diff --git a/stack/avdt/avdt_msg.c b/stack/avdt/avdt_msg.c
index ddbeb5539..dbeb0167b 100644
--- a/stack/avdt/avdt_msg.c
+++ b/stack/avdt/avdt_msg.c
@@ -1661,9 +1661,9 @@ void avdt_msg_send_grej(tAVDT_CCB *p_ccb, uint8_t sig_id, tAVDT_MSG *p_params)
     p_buf->len = (uint16_t) (p - p_start);
 
     /* stash sig, label, and message type in buf */
-    p_buf->event = 0;
-    AVDT_BLD_LAYERSPEC(p_buf->layer_specific, 0, p_params->hdr.label);
-    AVDT_TRACE_DEBUG("avdt_msg_send_grej");
+    p_buf->event = sig_id;
+    AVDT_BLD_LAYERSPEC(p_buf->layer_specific, AVDT_MSG_TYPE_GRJ, p_params->hdr.label);
+    AVDT_TRACE_DEBUG(__func__);
 
     /* queue message and trigger ccb to send it */
     fixed_queue_enqueue(p_ccb->rsp_q, p_buf);