commit ff4464a7e2614bf5a1a74a1803edca9f6b8cb0f7
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 15 17:50:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 15 17:50:07 2020 +0000
tree 26f82d4088203b0540e45f3ef85b3aeb6bb026f0
parent 89a54ddc16b53be2915e0cd520d37c635da9ae2c
parent 51e593d4f2d41b405ada8d861f67bbc12341462c

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

bluetooth/audio/2.1/default/BluetoothAudioProvider.cpp

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