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

Commit 7a50a1f8 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Make RawAddress into a class (1/3)" 

am: 24eb1daf

Change-Id: I61d249aa17044cd55b6834bc9563f648362621b6
parents 5b35ee9c 24eb1daf

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ subdirs = [ 
    "bta",

    "vendor_libs",

    "test",

    "types",

    "udrv",

    "tools",

]

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ cc_test { 
    static_libs: [

        "libbtcore",

        "libbt-bta",

        "libbluetooth-types",

        "libosi",

        "libbt-protos",

    ],

system/bta/ag/bta_ag_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  /* reinitialize stuff */



  /* clear the remote BD address */

  p_scb->peer_addr = bd_addr_empty;

  p_scb->peer_addr = RawAddress::kEmpty;



  /* call open cback w. failure */

  bta_ag_cback_open(p_scb, NULL, BTA_AG_FAIL_SDP);
@@ -347,7 +347,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  p_scb->svc_conn = false;

  p_scb->hsp_version = HSP_VERSION_1_2;

  /*Clear the BD address*/

  p_scb->peer_addr = bd_addr_empty;

  p_scb->peer_addr = RawAddress::kEmpty;



  /* reopen registered servers */

  bta_ag_start_servers(p_scb, p_scb->reg_services);
@@ -408,7 +408,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  /* if not deregistering (deallocating) reopen registered servers */

  if (p_scb->dealloc == false) {

    /* Clear peer bd_addr so instance can be reused */

    p_scb->peer_addr = bd_addr_empty;

    p_scb->peer_addr = RawAddress::kEmpty;



    /* start only unopened server */

    services = p_scb->reg_services;

system/bta/ag/bta_ag_rfc.cc

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) { 


      bta_ag_port_status = RFCOMM_CreateConnection(

          bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,

          bd_addr_any, &(p_scb->serv_handle[i]),

          RawAddress::kAny, &(p_scb->serv_handle[i]),

          bta_ag_mgmt_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1]);



      if (bta_ag_port_status == PORT_SUCCESS) {

system/bta/av/bta_av_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode, 
uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,

                         uint8_t lidx) {

  tAVRC_CONN_CB ccb;

  RawAddress bda = bd_addr_any;

  RawAddress bda = RawAddress::kAny;

  uint8_t status = BTA_AV_RC_ROLE_ACP;

  tBTA_AV_SCB* p_scb = p_cb->p_scb[shdl - 1];

  int i;
@@ -1247,7 +1247,7 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { 
      /* the stream is closed.

       * clear the peer address, so it would not mess up the AVRCP for the next

       * round of operation */

      p_scb->peer_addr = bd_addr_empty;

      p_scb->peer_addr = RawAddress::kEmpty;

      if (p_scb->chnl == BTA_AV_CHNL_AUDIO) {

        if (p_lcb) {

          p_lcb->conn_msk &= ~conn_msk;