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

Commit 718ac655 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[hardware][interfaces][bluetooth] fix -Wreorder-init-list" 

am: b6fd785e

Change-Id: I5196066409d763cf6ea5aa0125bc4a16ed7cd236
parents e6faf982 b6fd785e

bluetooth/audio/2.0/default/session/BluetoothAudioSession.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp

+4 −2
Original line number Diff line number Diff line
@@ -94,16 +94,18 @@ static const LdacParameters kDefaultOffloadLdacCapability = { 
static const AptxParameters kDefaultOffloadAptxCapability = {

    .sampleRate = static_cast<SampleRate>(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>(SampleRate::RATE_44100 |

                                          SampleRate::RATE_48000),

    .channelMode = ChannelMode::STEREO,

    .bitsPerSample = BitsPerSample::BITS_24,

    .channelMode = ChannelMode::STEREO};

};



const std::vector<CodecCapabilities> kDefaultOffloadA2dpCodecCapabilities = {

    {.codecType = CodecType::SBC, .capabilities = {}},