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

Commit 0384b527 authored by Chris Manton's avatar Chris Manton
Browse files

Use new API stack/btm/btm_sco 

BTM_CreateSco

Working towards encapsulation of tACL_CONN

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

system/stack/btm/btm_sco.cc

+1 −3
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, 
  tSCO_CONN* p = &btm_cb.sco_cb.sco_db[0];

  uint16_t xx;

  uint16_t acl_handle = 0;

  tACL_CONN* p_acl;

  *p_sco_inx = BTM_INVALID_SCO_INDEX;



  /* If originating, ensure that there is an ACL connection to the BD Address */
@@ -525,8 +524,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, 
        if (is_orig) {

          /* If role change is in progress, do not proceed with SCO setup

           * Wait till role change is complete */

          p_acl = btm_bda_to_acl(*remote_bda, BT_TRANSPORT_BR_EDR);

          if (p_acl && p_acl->switch_role_state != BTM_ACL_SWKEY_STATE_IDLE) {

          if (!acl_is_switch_role_idle(*remote_bda, BT_TRANSPORT_BR_EDR)) {

            BTM_TRACE_API("Role Change is in progress for ACL handle 0x%04x",

                          acl_handle);

            p->state = SCO_ST_PEND_ROLECHANGE;