Merge "Use safe_union correctly" am: baf61434fd am: 8e4e5639c9 am: 51e593d4f2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cb16ae1becb3af2eb16861b4d3d946cec56c227
This commit is contained in:
Treehugger Robot
2020-12-15 17:50:07 +00:00
committed by Automerger Merge Worker

View File

@@ -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);