diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-24 03:01:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-24 03:01:49 +0000 |
| commit | d69fa9b2ded2cab0b54cd9f11bf788d86112eb73 (patch) | |
| tree | 3ec9ff4936a3d718c24298a4bfd3d55f928c258d | |
| parent | 7cfda9f0709f0dfd7d453672584585b2779b36f5 (diff) | |
| parent | 6f5388224f1f57bb3e5717510cdf6b3836a211fb (diff) | |
| download | redfin-d69fa9b2ded2cab0b54cd9f11bf788d86112eb73.tar.gz | |
Snap for 7310088 from 6f5388224f1f57bb3e5717510cdf6b3836a211fb to sc-release
Change-Id: I35c7d5065fb98933ceb2b1c11c4ca084e607d64d
| -rw-r--r-- | audio/audio_policy_configuration.xml | 7 | ||||
| -rw-r--r-- | redfin/overlay/packages/apps/AvoidAppsInCutoutOverlay/Android.bp | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 136f037..ba8a8a7 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -84,6 +84,11 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/> </mixPort> + <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> + </mixPort> <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST"> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" @@ -188,6 +193,8 @@ sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + <route type="mix" sink="hotword input" + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voice_rx" diff --git a/redfin/overlay/packages/apps/AvoidAppsInCutoutOverlay/Android.bp b/redfin/overlay/packages/apps/AvoidAppsInCutoutOverlay/Android.bp index a493394..17b278d 100644 --- a/redfin/overlay/packages/apps/AvoidAppsInCutoutOverlay/Android.bp +++ b/redfin/overlay/packages/apps/AvoidAppsInCutoutOverlay/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + runtime_resource_overlay { name: "AvoidAppsInCutoutOverlay", theme: "DisplayCutoutAvoidAppsInCutout", |