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

Commit baf61434 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use safe_union correctly"

parents a07d0556 0f0c5d17
Loading
Loading
Loading
Loading
+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);