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

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

Remove bta_sys_set_default_policy 

call through directly

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ief881395dc3d977ebf24d1923d2354a87141ba59
parent a92c688a

system/bta/av/bta_av_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -1270,8 +1270,7 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { 
    if (p_cb->audio_open_cnt == 1) {

      /* one audio channel goes down and there's one audio channel remains open.

       * restore the switch role in default link policy */

      bta_sys_set_default_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH);

      /* allow role switch, if this is the last connection */

      BTA_dm_unblock_role_switch(BTA_ID_AV);

      bta_av_restore_switch();

    }

    if (p_cb->audio_open_cnt) {

system/bta/sys/bta_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -245,8 +245,8 @@ extern void bta_sys_set_policy(uint8_t id, uint8_t policy, 
                               const RawAddress& peer_addr);

extern void bta_sys_clear_policy(uint8_t id, uint8_t policy,

                                 const RawAddress& peer_addr);

extern void bta_sys_set_default_policy(uint8_t id, uint8_t policy);



void BTA_dm_unblock_role_switch(uint8_t app_id);

void BTA_dm_block_role_switch(uint8_t app_id);



#endif /* BTA_SYS_H */

system/bta/sys/bta_sys_conn.cc

+0 −16
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


void BTA_dm_set_policy(uint8_t policy, const RawAddress& peer_addr);

void BTA_dm_clear_policy(uint8_t policy, const RawAddress& peer_addr);

void BTA_dm_unblock_role_switch(uint8_t app_id);



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

 *
@@ -380,21 +379,6 @@ void bta_sys_clear_policy(uint8_t id, uint8_t policy, 
  BTA_dm_clear_policy(policy, peer_addr);

}



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

 *

 * Function         bta_sys_set_default_policy

 *

 * Description      Called by BTA subsystems to indicate that the given default

 *                  link policy should be set

 *

 * Returns          void

 *

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

void bta_sys_set_default_policy(uint8_t id, uint8_t policy) {

  APPL_TRACE_DEBUG("%s: id:%d policy:0x%x", __func__, id, policy);

  BTA_dm_unblock_role_switch(id);

}



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

 *

 * Function         bta_sys_idle