Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I971a63dc8a73982a5bb394c9c148037cb3fe12b8
This commit is contained in:
Treehugger Robot
2020-12-15 17:35:42 +00:00
committed by Automerger Merge Worker
parent 9f0ca6fac5 8e4e5639c9
commit 51e593d4f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp
View File

@@ -57,14 +57,14 @@ Return<void> BluetoothAudioProvider::startSession(
if (audioConfig.getDiscriminator() == if (audioConfig.getDiscriminator() ==
V2_0::AudioConfiguration::hidl_discriminator::pcmConfig) { V2_0::AudioConfiguration::hidl_discriminator::pcmConfig) {
audioConfig_2_1.pcmConfig() = { audioConfig_2_1.pcmConfig({
.sampleRate = .sampleRate =
static_cast<SampleRate>(audioConfig.pcmConfig().sampleRate), static_cast<SampleRate>(audioConfig.pcmConfig().sampleRate),
.channelMode = audioConfig.pcmConfig().channelMode, .channelMode = audioConfig.pcmConfig().channelMode,
.bitsPerSample = audioConfig.pcmConfig().bitsPerSample, .bitsPerSample = audioConfig.pcmConfig().bitsPerSample,
.dataIntervalUs = 0}; .dataIntervalUs = 0});
} else { } else {
audioConfig_2_1.codecConfig() = audioConfig.codecConfig(); audioConfig_2_1.codecConfig(audioConfig.codecConfig());
} }
return startSession_2_1(hostIf, audioConfig_2_1, _hidl_cb); return startSession_2_1(hostIf, audioConfig_2_1, _hidl_cb);