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

Commit f0f1d45d authored by Zach Johnson's avatar Zach Johnson
Browse files

BTA_AR_INCLUDED is always true 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id97ddfced6fe2d6885e50bbda2b1d3496edd360c
parent 56854c56

system/bta/av/bta_av_aact.cc

+0 −4
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ 
#include "osi/include/properties.h"

#include "stack/include/acl_api.h"

#include "utl.h"

#if (BTA_AR_INCLUDED == TRUE)

#include "bta_ar_api.h"

#endif



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

 *  Constants
@@ -1263,9 +1261,7 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
        }

      }

    }

#if (BTA_AR_INCLUDED == TRUE)

    bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr, p_scb->hdi);

#endif

    if (p_scb->seps[p_scb->sep_idx].tsep == AVDT_TSEP_SRC) {

      open.starting = false;

      open.sep = AVDT_TSEP_SNK;

system/bta/av/bta_av_act.cc

+0 −8
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ 
#include "stack/include/acl_api.h"

#include "utl.h"



#if (BTA_AR_INCLUDED == TRUE)

#include "bta_ar_api.h"

#endif



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

 *  Constants
@@ -1475,11 +1473,9 @@ void bta_av_sig_chg(tBTA_AV_DATA* p_data) { 
      }

    }

  }

#if (BTA_AR_INCLUDED == TRUE)

  else if (event == BTA_AR_AVDT_CONN_EVT) {

    alarm_cancel(bta_av_cb.link_signalling_timer);

  }

#endif

  else {

    /* disconnected. */

    APPL_TRACE_DEBUG("%s: bta_av_cb.conn_lcb=0x%x", __func__,
@@ -2272,9 +2268,7 @@ void bta_av_dereg_comp(tBTA_AV_DATA* p_data) { 


    /* remove the A2DP SDP record, if no more audio stream is left */

    if (!p_cb->reg_audio) {

#if (BTA_AR_INCLUDED == TRUE)

      bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, BTA_ID_AV);

#endif

      if (p_cb->sdp_a2dp_handle) {

        bta_av_del_sdp_rec(&p_cb->sdp_a2dp_handle);

        p_cb->sdp_a2dp_handle = 0;
@@ -2297,14 +2291,12 @@ void bta_av_dereg_comp(tBTA_AV_DATA* p_data) { 
                   p_cb->disabling);

  /* if no stream control block is active */

  if (p_cb->reg_audio == 0) {

#if (BTA_AR_INCLUDED == TRUE)

    /* deregister from AVDT */

    bta_ar_dereg_avdt(BTA_ID_AV);



    /* deregister from AVCT */

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REM_CTRL_TARGET, BTA_ID_AV);

    bta_ar_dereg_avct(BTA_ID_AV);

#endif



    if (p_cb->disabling) {

      p_cb->disabling = false;

system/bta/av/bta_av_main.cc

+0 −16
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ 
#include "stack/include/acl_api.h"

#include "utl.h"



#if (BTA_AR_INCLUDED == TRUE)

#include "bta_ar_api.h"

#endif



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

 * Constants and types
@@ -241,7 +239,6 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) { 
      bta_sys_remove_uuid(UUID_SERVCLASS_AUDIO_SINK);

    }

#endif

#if (BTA_AR_INCLUDED == TRUE)

    // deregister from AVDT

    bta_ar_dereg_avdt(BTA_ID_AV);
@@ -249,7 +246,6 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) { 
    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, BTA_ID_AV);

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REM_CTRL_TARGET, BTA_ID_AV);

    bta_ar_dereg_avct(BTA_ID_AV);

#endif

  }



  /* initialize control block */
@@ -437,12 +433,8 @@ void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, const RawAddress& bd_addr, 
  uint16_t evt = 0;

  tBTA_AV_SCB* p_scb = NULL;



#if (BTA_AR_INCLUDED == TRUE)

  if (event == BTA_AR_AVDT_CONN_EVT || event == AVDT_CONNECT_IND_EVT ||

      event == AVDT_DISCONNECT_IND_EVT)

#else

  if (event == AVDT_CONNECT_IND_EVT || event == AVDT_DISCONNECT_IND_EVT)

#endif

  {

    evt = BTA_AV_SIG_CHG_EVT;

    if (event == AVDT_DISCONNECT_IND_EVT) {
@@ -568,15 +560,12 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
      reg.idle_tout = BTA_AV_IDLE_TOUT;

      reg.sec_mask = BTA_SEC_AUTHENTICATE;

      reg.scb_index = p_scb->hdi;

#if (BTA_AR_INCLUDED == TRUE)

      bta_ar_reg_avdt(&reg, bta_av_conn_cback, BTA_ID_AV);

#endif

      bta_sys_role_chg_register(&bta_av_sys_rs_cback);



      /* create remote control TG service if required */

      if (bta_av_cb.features & (BTA_AV_FEAT_RCTG)) {

/* register with no authorization; let AVDTP use authorization instead */

#if (BTA_AR_INCLUDED == TRUE)

        bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu,

                        BTA_ID_AV);
@@ -602,7 +591,6 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
            UUID_SERVCLASS_AV_REM_CTRL_TARGET, "AV Remote Control Target", NULL,

            p_bta_av_cfg->avrc_tg_cat, BTA_ID_AV,

            (bta_av_cb.features & BTA_AV_FEAT_BROWSE), profile_version);

#endif

      }



      /* Set the Capturing service class bit */
@@ -727,13 +715,10 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
      if (bta_av_cb.features & (BTA_AV_FEAT_RCCT)) {

        /* if TG is not supported, we need to register to AVCT now */

        if ((bta_av_cb.features & (BTA_AV_FEAT_RCTG)) == 0) {

#if (BTA_AR_INCLUDED == TRUE)

          bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu,

                          BTA_ID_AV);

#endif

          bta_av_rc_create(&bta_av_cb, AVCT_ACP, 0, BTA_AV_NUM_LINKS + 1);

        }

#if (BTA_AR_INCLUDED == TRUE)

        /* create an SDP record as AVRC CT. We create 1.3 for SOURCE

         * because we rely on feature bits being scanned by external

         * devices more than the profile version itself.
@@ -751,7 +736,6 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
                          (bta_av_cb.features & BTA_AV_FEAT_BROWSE),

                          AVRC_REV_1_6);

        }

#endif

      }

    }

    bta_av_cb.reg_audio |= BTA_AV_HNDL_TO_MSK(p_scb->hdi);

system/btif/src/stack_manager.cc

+0 −4
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ 
#include "stack/include/hidh_api.h"

#endif

#include "stack/include/smp_api.h"

#if (defined BTA_AR_INCLUDED) && (BTA_AR_INCLUDED == TRUE)

#include "bta_ar_api.h"

#endif

#include "bta/sys/bta_sys_int.h"

#include "bta_dm_int.h"

#include "btif/include/btif_pan.h"
@@ -225,9 +223,7 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 
#endif



  bta_sys_init();

#if (defined BTA_AR_INCLUDED) && (BTA_AR_INCLUDED == TRUE)

  bta_ar_init();

#endif

  module_init(get_module(BTE_LOGMSG_MODULE));



  main_thread_start_up();

system/internal_include/bt_target.h

+0 −4
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ 
#define BTA_HH_LE_INCLUDED TRUE

#endif



#ifndef BTA_AR_INCLUDED

#define BTA_AR_INCLUDED TRUE

#endif



#ifndef BTA_AV_SINK_INCLUDED

#define BTA_AV_SINK_INCLUDED FALSE

#endif