Don't reuse AVDTP internal state for different purposes

am: c64dc1d284

Change-Id: Ia42b343751f2fa48a0b8f601256828d3c15718b2

diff --cc bta/av/bta_av_aact.cc
Simple merge

diff --cc btif/co/bta_av_co.cc
Simple merge

diff --cc stack/avdt/avdt_api.cc
index 7b32b57,5369f6e..a7a6fa5
--- 1/stack/avdt/avdt_api.cc
--- 2/stack/avdt/avdt_api.cc
+++ b/stack/avdt/avdt_api.cc
@@@ -337,9 -357,12 +358,12 @@@ static uint16_t avdt_get_cap_req(const 
   * Returns          AVDT_SUCCESS if successful, otherwise error.
   *
   ******************************************************************************/
 -uint16_t AVDT_GetCapReq(BD_ADDR bd_addr, uint8_t seid, tAVDT_CFG* p_cfg,
 -                        tAVDT_CTRL_CBACK* p_cback) {
 +uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t seid,
 +                        tAVDT_CFG* p_cfg, tAVDT_CTRL_CBACK* p_cback) {
    tAVDT_CCB_API_GETCAP getcap;
+   uint16_t result = AVDT_SUCCESS;
+ 
+   AVDT_TRACE_DEBUG("%s", __func__);
  
    getcap.single.seid = seid;
    getcap.single.sig_id = AVDT_SIG_GETCAP;
@@@ -372,9 -399,12 +400,12 @@@
   * Returns          AVDT_SUCCESS if successful, otherwise error.
   *
   ******************************************************************************/
 -uint16_t AVDT_GetAllCapReq(BD_ADDR bd_addr, uint8_t seid, tAVDT_CFG* p_cfg,
 -                           tAVDT_CTRL_CBACK* p_cback) {
 +uint16_t AVDT_GetAllCapReq(const RawAddress& bd_addr, uint8_t seid,
 +                           tAVDT_CFG* p_cfg, tAVDT_CTRL_CBACK* p_cback) {
    tAVDT_CCB_API_GETCAP getcap;
+   uint16_t result = AVDT_SUCCESS;
+ 
+   AVDT_TRACE_DEBUG("%s", __func__);
  
    getcap.single.seid = seid;
    getcap.single.sig_id = AVDT_SIG_GET_ALLCAP;

diff --cc stack/avdt/avdt_ccb.cc
Simple merge

diff --cc stack/avdt/avdt_ccb_act.cc
Simple merge

diff --cc stack/avdt/avdt_scb_act.cc
Simple merge