| commit | 51e593d4f2d41b405ada8d861f67bbc12341462c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 15 17:35:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 17:35:42 2020 +0000 |
| tree | 643b4200220f9c71641c1abbfe38d33b79f9a08e | |
| parent | 9f0ca6fac5dae0ef9da80db08551747fb6fcfaae [diff] | |
| parent | 8e4e5639c96d6d207577ba1087ce2c44ea664183 [diff] |
Merge "Use safe_union correctly" am: baf61434fd am: 8e4e5639c9 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I971a63dc8a73982a5bb394c9c148037cb3fe12b8
diff --git a/bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp b/bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp index 092038b..73fe06c 100644 --- a/bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp +++ b/bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp
@@ -57,14 +57,14 @@ 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);