commit 67277dd351fadb14a2b564f12432695fd6137a9c
author Rios Kao <rioskao@google.com> Tue Mar 09 03:02:57 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 09 03:02:57 2021 +0000
tree b892678bc1ca0fb8e0bae2ab1c4a1cc99451ca5a
parent 0ccb1ab0b37d8036700de11fbf7f042c362b04ae
parent 00ba8df5a49c34cc40adefd2992446493e9af99c

Merge "support music_break model for whi product" into sc-dev

audio/oriole/config/sound_trigger_configuration.xml

diff --git a/audio/oriole/config/sound_trigger_configuration.xml b/audio/oriole/config/sound_trigger_configuration.xml
index a592910..dbee090 100644
--- a/audio/oriole/config/sound_trigger_configuration.xml
+++ b/audio/oriole/config/sound_trigger_configuration.xml
@@ -28,5 +28,6 @@
     <supported_model>
         <model name="CLIENT_HOTWORD" uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" model_type="keyphrase" bargein="true"/>
         <model name="CLIENT_AMBIENT_MUSIC" uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" model_type="generic" bargein="false"/>
+        <model name="CLIENT_AMBIENT_MUSIC_BREAK" uuid="12caddb1-acdb-4dce-8cb0-2e95a2313aee" model_type="generic" bargein="false"/>
     </supported_model>
 </sound_trigger_hal_configuration>

audio/raven/config/sound_trigger_configuration.xml

diff --git a/audio/raven/config/sound_trigger_configuration.xml b/audio/raven/config/sound_trigger_configuration.xml
index a592910..dbee090 100644
--- a/audio/raven/config/sound_trigger_configuration.xml
+++ b/audio/raven/config/sound_trigger_configuration.xml
@@ -28,5 +28,6 @@
     <supported_model>
         <model name="CLIENT_HOTWORD" uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" model_type="keyphrase" bargein="true"/>
         <model name="CLIENT_AMBIENT_MUSIC" uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" model_type="generic" bargein="false"/>
+        <model name="CLIENT_AMBIENT_MUSIC_BREAK" uuid="12caddb1-acdb-4dce-8cb0-2e95a2313aee" model_type="generic" bargein="false"/>
     </supported_model>
 </sound_trigger_hal_configuration>

audio/slider/config/sound_trigger_configuration.xml

diff --git a/audio/slider/config/sound_trigger_configuration.xml b/audio/slider/config/sound_trigger_configuration.xml
index a592910..dbee090 100644
--- a/audio/slider/config/sound_trigger_configuration.xml
+++ b/audio/slider/config/sound_trigger_configuration.xml
@@ -28,5 +28,6 @@
     <supported_model>
         <model name="CLIENT_HOTWORD" uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" model_type="keyphrase" bargein="true"/>
         <model name="CLIENT_AMBIENT_MUSIC" uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" model_type="generic" bargein="false"/>
+        <model name="CLIENT_AMBIENT_MUSIC_BREAK" uuid="12caddb1-acdb-4dce-8cb0-2e95a2313aee" model_type="generic" bargein="false"/>
     </supported_model>
 </sound_trigger_hal_configuration>

audio/whitefin/config/sound_trigger_configuration.xml

diff --git a/audio/whitefin/config/sound_trigger_configuration.xml b/audio/whitefin/config/sound_trigger_configuration.xml
index a592910..dbee090 100644
--- a/audio/whitefin/config/sound_trigger_configuration.xml
+++ b/audio/whitefin/config/sound_trigger_configuration.xml
@@ -28,5 +28,6 @@
     <supported_model>
         <model name="CLIENT_HOTWORD" uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" model_type="keyphrase" bargein="true"/>
         <model name="CLIENT_AMBIENT_MUSIC" uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" model_type="generic" bargein="false"/>
+        <model name="CLIENT_AMBIENT_MUSIC_BREAK" uuid="12caddb1-acdb-4dce-8cb0-2e95a2313aee" model_type="generic" bargein="false"/>
     </supported_model>
 </sound_trigger_hal_configuration>