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

Commit c8d2a49e authored by David Duarte's avatar David Duarte
Browse files

Re-enable -Wformat as error 

Test: mmm packages/modules/Bluetooth
Flag: EXEMPT, build change
Bug: 315250603
Change-Id: Ia4b367609f278103494c3870b17bea6f127b1f7c
parent 83f77de2

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ cc_defaults { 
        "-Werror",

        "-Wextra",

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

        "-Werror=format",

        "-Werror=reorder-init-list",

    ],

    c_std: "c99",

system/audio_bluetooth_hw/device_port_proxy.cc

+2 −2
Original line number Diff line number Diff line
@@ -583,8 +583,8 @@ bool BluetoothAudioPortAidl::GetPresentationPosition( 
                    presentation_position.transmittedOctetsTimestamp.tvSec),

                .tv_nsec = static_cast<long>(

                    presentation_position.transmittedOctetsTimestamp.tvNSec)};

  LOG(VERBOSE) << __func__

               << ": session_type=" << StringPrintf("%#hhx", session_type_)

  LOG(VERBOSE) << __func__ << ": session_type="

               << StringPrintf("%#x", static_cast<unsigned>(session_type_))

               << ", cookie=" << StringPrintf("%#hx", cookie_)

               << ", state=" << state_ << ", delay=" << *delay_ns

               << "ns, data=" << *bytes

system/audio_bluetooth_hw/device_port_proxy_hidl.cc

+2 −2
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ bool BluetoothAudioPortHidl::GetPresentationPosition( 
  }

  bool retval = BluetoothAudioSessionControl_2_1::GetPresentationPosition(

      session_type_hidl_, delay_ns, bytes, timestamp);

  LOG(VERBOSE) << __func__

               << ": session_type=" << StringPrintf("%#hhx", session_type_hidl_)

  LOG(VERBOSE) << __func__ << ": session_type="

               << StringPrintf("%#x", static_cast<unsigned>(session_type_hidl_))

               << ", cookie=" << StringPrintf("%#hx", cookie_)

               << ", state=" << state_ << ", delay=" << *delay_ns

               << "ns, data=" << *bytes

system/audio_bluetooth_hw/stream_apis.cc

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ std::ostream& operator<<(std::ostream& os, const BluetoothStreamState& state) { 
    case BluetoothStreamState::UNKNOWN:

      return os << "UNKNOWN";

    default:

      return os << StringPrintf("%#hhx", state);

      return os << StringPrintf("%#x", static_cast<unsigned>(state));

  }

}

system/bta/le_audio/client.cc

+1 −1
Original line number Diff line number Diff line
@@ -3845,7 +3845,7 @@ class LeAudioClientImpl : public LeAudioClient { 
            (reconnection_mode_ == BTM_BLE_BKG_CONNECT_ALLOW_LIST

                 ? "Allow List"

                 : "Targeted Announcements"));

    dprintf(fd, "  configuration: %s  (0x%08hx)\n",

    dprintf(fd, "  configuration: %s  (0x%08x)\n",

            bluetooth::common::ToString(configuration_context_type_).c_str(),

            static_cast<uint16_t>(configuration_context_type_));

    dprintf(fd, "  local source metadata context type mask: %s\n",