| commit | 8e4e5639c96d6d207577ba1087ce2c44ea664183 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 15 16:59:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 16:59:38 2020 +0000 |
| tree | 4036ace77ee99974fc4fc9cdc40584df0d7c70d4 | |
| parent | 3196c429e0163c6066808a95e3201847eb024a5d [diff] | |
| parent | baf61434fd49d96b4f4f3a143059a2f332d3b3f2 [diff] |
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
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);