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

Commit 94424cc6 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I6266c445,I0d9e9296 

* changes:
  A2DP: Don't wait for role switch when unsupported by the BT SoC
  A2DP: Don't wait for role switch on a blacklisted device
parents cac936fd e1f51b85

system/bta/av/bta_av_main.cc

+4 −2
Original line number Diff line number Diff line
@@ -1114,10 +1114,12 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { 
                  "%s: peer %s BTM_SwitchRole(BTM_ROLE_MASTER) error: %d",

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

      }

      if (status != BTM_MODE_UNSUPPORTED && status != BTM_DEV_BLACKLISTED) {

        is_ok = false;

        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;

      }

    }

  }



  return is_ok;

}