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

Commit 51e593d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use safe_union correctly" am: baf61434 am: 8e4e5639 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I971a63dc8a73982a5bb394c9c148037cb3fe12b8
parents 9f0ca6fa 8e4e5639

bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp

+3 −3
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ Return<void> BluetoothAudioProvider::startSession( 


  if (audioConfig.getDiscriminator() ==

      V2_0::AudioConfiguration::hidl_discriminator::pcmConfig) {

    audioConfig_2_1.pcmConfig() = {

    audioConfig_2_1.pcmConfig({

        .sampleRate =

            static_cast<SampleRate>(audioConfig.pcmConfig().sampleRate),

        .channelMode = audioConfig.pcmConfig().channelMode,

        .bitsPerSample = audioConfig.pcmConfig().bitsPerSample,

        .dataIntervalUs = 0};

        .dataIntervalUs = 0});

  } else {

    audioConfig_2_1.codecConfig() = audioConfig.codecConfig();

    audioConfig_2_1.codecConfig(audioConfig.codecConfig());

  }



  return startSession_2_1(hostIf, audioConfig_2_1, _hidl_cb);