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

Commit 7c856450 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[system][bt] fix -Wc99-designator" 

am: 800653ae

Change-Id: Iaee95ebfca731a69f996f9584f7df49d4c9c7ca9
parents 21877e2a 800653ae

system/bta/ag/bta_ag_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -564,8 +564,8 @@ void bta_ag_resume_open(tBTA_AG_SCB* p_scb) { 
  if (p_scb->state == BTA_AG_INIT_ST) {

    LOG(INFO) << __func__ << ": Resume connection to " << p_scb->peer_addr

              << ", handle" << bta_ag_scb_to_idx(p_scb);

    tBTA_AG_DATA open_data = {.api_open.bd_addr = p_scb->peer_addr,

                              .api_open.sec_mask = p_scb->cli_sec_mask};

    tBTA_AG_DATA open_data = {.api_open = {.bd_addr = p_scb->peer_addr,

                                           .sec_mask = p_scb->cli_sec_mask}};

    bta_ag_sm_execute(p_scb, BTA_AG_API_OPEN_EVT, open_data);

  } else {

    VLOG(1) << __func__ << ": device " << p_scb->peer_addr

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) { 
    } else {

      event = BTA_AG_DISC_INT_RES_EVT;

    }

    tBTA_AG_DATA disc_result = {.disc_result.status = status};

    tBTA_AG_DATA disc_result = {.disc_result = {.status = status}};

    do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, idx,

                                            event, disc_result));

  }

system/btif/src/btif_hf_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static bt_status_t send_at_cmd(const RawAddress* bd_addr, int cmd, int val1, 
}



static const bthf_client_interface_t bthfClientInterface = {

    sizeof(bthf_client_interface_t),

    .size = sizeof(bthf_client_interface_t),

    .init = init,

    .connect = connect,

    .disconnect = disconnect,

system/gd/os/linux_generic/reactor.cc

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ Reactor::Reactable* Reactor::Register(int fd, Closure on_read_ready, Closure on_ 
  auto* reactable = new Reactable(fd, on_read_ready, on_write_ready);

  epoll_event event = {

      .events = poll_event_type,

      {.ptr = reactable}

      .data = {.ptr = reactable},

  };

  int register_fd;

  RUN_NO_INTR(register_fd = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, fd, &event));
@@ -217,7 +217,7 @@ void Reactor::ModifyRegistration(Reactor::Reactable* reactable, Closure on_read_ 
  }

  epoll_event event = {

      .events = poll_event_type,

      {.ptr = reactable}

      .data = {.ptr = reactable},

  };

  int modify_fd;

  RUN_NO_INTR(modify_fd = epoll_ctl(epoll_fd_, EPOLL_CTL_MOD, reactable->fd_, &event));

system/profile/avrcp/tests/avrcp_connection_handler_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class AvrcpConnectionHandlerTest : public testing::Test { 
        .p_next_attr = nullptr,

        .attr_id = 0,

        .attr_len_type = 0,

        .attr_value.v.u16 = 0,

        .attr_value = {.v = {.u16 = 0}},

    };



    if (browsing) fake_features.attr_value.v.u16 |= AVRC_SUPF_CT_BROWSE;