mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
Merge "Use safe_union correctly" am: baf61434fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I89dac63df8547d9609a547cc8081de374505f4eb
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user