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

Commit 18680fc5 authored by Marie Janssen's avatar Marie Janssen Committed by Gerrit Code Review
Browse files

Merge "Fix a inappropriate return of local var address"

parents af061d3b c4004133

system/stack/a2dp/a2dp_api.cc

+5 −5
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
 *  Global data

 ****************************************************************************/

tA2DP_CB a2dp_cb;

static uint16_t a2dp_attr_list[] = {

    ATTR_ID_SERVICE_CLASS_ID_LIST, /* update A2DP_NUM_ATTR, if changed */

    ATTR_ID_BT_PROFILE_DESC_LIST,  ATTR_ID_SUPPORTED_FEATURES,

    ATTR_ID_SERVICE_NAME,          ATTR_ID_PROTOCOL_DESC_LIST,

    ATTR_ID_PROVIDER_NAME};



/******************************************************************************

 *
@@ -266,11 +271,6 @@ tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, const bt_bdaddr_t& bd_addr, 
                              tA2DP_FIND_CBACK* p_cback) {

  tSDP_UUID uuid_list;

  bool result = true;

  uint16_t a2dp_attr_list[] = {

      ATTR_ID_SERVICE_CLASS_ID_LIST, /* update A2DP_NUM_ATTR, if changed */

      ATTR_ID_BT_PROFILE_DESC_LIST,  ATTR_ID_SUPPORTED_FEATURES,

      ATTR_ID_SERVICE_NAME,          ATTR_ID_PROTOCOL_DESC_LIST,

      ATTR_ID_PROVIDER_NAME};



  LOG_VERBOSE(LOG_TAG, "%s: uuid: 0x%x", __func__, service_uuid);

  if ((service_uuid != UUID_SERVCLASS_AUDIO_SOURCE &&

system/stack/avrc/avrc_sdp.cc

+6 −6
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
 *  Global data

 ****************************************************************************/

tAVRC_CB avrc_cb;

static uint16_t a2dp_attr_list_sdp[] = {

    ATTR_ID_SERVICE_CLASS_ID_LIST, /* update A2DP_NUM_ATTR, if changed */

    ATTR_ID_BT_PROFILE_DESC_LIST,  ATTR_ID_SUPPORTED_FEATURES,

    ATTR_ID_SERVICE_NAME,          ATTR_ID_PROTOCOL_DESC_LIST,

    ATTR_ID_PROVIDER_NAME};



/******************************************************************************

 *
@@ -103,11 +108,6 @@ uint16_t AVRC_FindService(uint16_t service_uuid, const bt_bdaddr_t& bd_addr, 
                          tAVRC_FIND_CBACK* p_cback) {

  tSDP_UUID uuid_list;

  bool result = true;

  uint16_t a2dp_attr_list[] = {

      ATTR_ID_SERVICE_CLASS_ID_LIST, /* update AVRC_NUM_ATTR, if changed */

      ATTR_ID_PROTOCOL_DESC_LIST,    ATTR_ID_BT_PROFILE_DESC_LIST,

      ATTR_ID_SERVICE_NAME,          ATTR_ID_SUPPORTED_FEATURES,

      ATTR_ID_PROVIDER_NAME};



  AVRC_TRACE_API("%s uuid: %x", __func__, service_uuid);

  if ((service_uuid != UUID_SERVCLASS_AV_REM_CTRL_TARGET &&
@@ -125,7 +125,7 @@ uint16_t AVRC_FindService(uint16_t service_uuid, const bt_bdaddr_t& bd_addr, 
  uuid_list.uu.uuid16 = service_uuid;



  if (p_db->p_attrs == NULL || p_db->num_attr == 0) {

    p_db->p_attrs = a2dp_attr_list;

    p_db->p_attrs = a2dp_attr_list_sdp;

    p_db->num_attr = AVRC_NUM_ATTR;

  }