From 0fd95b24736573b31b318acaf79ffd6fa829490b Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Wed, 9 Oct 2019 11:28:47 -0700 Subject: [PATCH] [hardware][interfaces][bluetooth] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Change-Id: Ie34b4f3400439817bebd30ee0356e35a87c971e5 Signed-off-by: Nick Desaulniers --- bluetooth/audio/2.0/default/session/BluetoothAudioSession.h | 3 ++- .../2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bluetooth/audio/2.0/default/session/BluetoothAudioSession.h b/bluetooth/audio/2.0/default/session/BluetoothAudioSession.h index 85e8742d07..838d1ccad0 100644 --- a/bluetooth/audio/2.0/default/session/BluetoothAudioSession.h +++ b/bluetooth/audio/2.0/default/session/BluetoothAudioSession.h @@ -156,8 +156,9 @@ class BluetoothAudioSession { static constexpr PcmParameters kInvalidPcmParameters = { .sampleRate = SampleRate::RATE_UNKNOWN, + .channelMode = ChannelMode::UNKNOWN, .bitsPerSample = BitsPerSample::BITS_UNKNOWN, - .channelMode = ChannelMode::UNKNOWN}; + }; // can't be constexpr because of non-literal type static const CodecConfiguration kInvalidCodecConfiguration; diff --git a/bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp b/bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp index 292e28b3b2..6ea61e1f18 100644 --- a/bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp +++ b/bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp @@ -94,16 +94,18 @@ static const LdacParameters kDefaultOffloadLdacCapability = { static const AptxParameters kDefaultOffloadAptxCapability = { .sampleRate = static_cast(SampleRate::RATE_44100 | SampleRate::RATE_48000), + .channelMode = ChannelMode::STEREO, .bitsPerSample = BitsPerSample::BITS_16, - .channelMode = ChannelMode::STEREO}; +}; // aptX HD: mSampleRate:(44100|48000), mBitsPerSample:(24), // mChannelMode:(STEREO) static const AptxParameters kDefaultOffloadAptxHdCapability = { .sampleRate = static_cast(SampleRate::RATE_44100 | SampleRate::RATE_48000), + .channelMode = ChannelMode::STEREO, .bitsPerSample = BitsPerSample::BITS_24, - .channelMode = ChannelMode::STEREO}; +}; const std::vector kDefaultOffloadA2dpCodecCapabilities = { {.codecType = CodecType::SBC, .capabilities = {}},