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

Commit e0297d7d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log bta/av/bta_av_aact::bta_av_conn_failed am: 3256d061 am: 8f9aba65 am: 958245c5 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1532312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01219accb10cc7d53b4135cb46299266282c86be
parents a3fc5e5a 958245c5

system/bta/av/bta_av_aact.cc

+8 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "a2dp_sbc.h"

#include "avdt_api.h"

#include "avrcp_service.h"

#include "bta_ar_api.h"

#include "bta_av_int.h"

#include "btif/include/btif_av_co.h"

#include "btif/include/btif_config.h"
@@ -42,12 +43,12 @@ 
#include "device/include/interop.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/include/acl_api.h"

#include "utl.h"

#include "bta_ar_api.h"



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

 *  Constants
@@ -1781,11 +1782,13 @@ void bta_av_conn_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  uint8_t cur_role;



  LOG_INFO("%s: peer %s sco_occupied:%s role:0x%x started:%s wait:0x%x",

           __func__, p_scb->PeerAddress().ToString().c_str(),

           logbool(bta_av_cb.sco_occupied).c_str(), p_scb->role,

  LOG_INFO(

      "A2dp stream start peer:%s sco_occupied:%s role:%s started:%s wait:0x%x",

      PRIVATE_ADDRESS(p_scb->PeerAddress()),

      logbool(bta_av_cb.sco_occupied).c_str(), RoleText(p_scb->role).c_str(),

      logbool(p_scb->started).c_str(), p_scb->wait);

  if (bta_av_cb.sco_occupied) {

    LOG_WARN("A2dp stream start failed");

    bta_av_start_failed(p_scb, p_data);

    return;

  }