commit 6dcf4f5c53b295e8943034c4b7d3c7a5cae818be
author Mikhail Naganov <mnaganov@google.com> Tue Aug 31 17:45:13 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Tue Aug 31 18:13:20 2021 -0700
tree 8a25e4ca9c99c560698000d50abc8f54bfe03304
parent c0478bb1f83efc967e92e798071b4dd10241dd74

Update use of a.m.a.c.AudioConfig in sthal_cli_3

Bug: 188932434
Test: m sthal_cli_3
Change-Id: Ifcc94ecfa7aa9d9a5292f45a35083c4681223529

soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java

diff --git a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
index 2922e83..0fd1dda 100644
--- a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
+++ b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
@@ -21,6 +21,7 @@
 import android.hardware.soundtrigger3.ISoundTriggerHwGlobalCallback;
 import android.media.audio.common.AudioChannelLayout;
 import android.media.audio.common.AudioConfig;
+import android.media.audio.common.AudioConfigBase;
 import android.media.audio.common.AudioFormatDescription;
 import android.media.audio.common.AudioFormatType;
 import android.media.audio.common.PcmType;
@@ -348,11 +349,12 @@
 
         private static AudioConfig createConfig() {
             AudioConfig config = new AudioConfig();
-            config.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO);
-            config.format = new AudioFormatDescription();
-            config.format.type = AudioFormatType.PCM;
-            config.format.pcm = PcmType.INT_16_BIT;
-            config.sampleRateHz = 16000;
+            config.base = new AudioConfigBase();
+            config.base.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO);
+            config.base.format = new AudioFormatDescription();
+            config.base.format.type = AudioFormatType.PCM;
+            config.base.format.pcm = PcmType.INT_16_BIT;
+            config.base.sampleRate = 16000;
             return config;
         }
     }