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

Commit 636ad90d authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes Iac0b15ba,Ifad02779 into main 

* changes:
  Force reorder-init-list as error
  Fix reorder-init-list in power telemetry
parents 5b4d1008 27297183

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ cc_defaults { 
        "-Wall",

        "-Werror",

        "-Wextra",

        // Override global.go that demote the error to a warning

        "-Werror=reorder-init-list",

    ],

    c_std: "c99",

    cpp_std: "c++17",

system/osi/src/stack_power_telemetry.cc

+1 −1
Original line number Diff line number Diff line
@@ -514,10 +514,10 @@ void power_telemetry::PowerTelemetry::LogChannelConnected( 
  ChannelDetails channel_details = {

      .bd_addr = bd_addr,

      .psm = psm,

      .channel_type = channel_type,

      .src.cid = static_cast<uint16_t>(src_id),

      .dst.cid = static_cast<uint16_t>(dst_id),

      .state = State::kConnected,

      .channel_type = channel_type,

      .data_transfer = {},

      .duration.begin = get_current_time(),

      .rx = {},