diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:26:11 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:26:11 +0000 |
| commit | 2339e6a36ee40563fcc160baf96a4bdc47ec76b3 (patch) | |
| tree | 3f7b1b3efa93aff2aaa29c80c7792171a7721084 | |
| parent | 9f71a942663e75b32a7396eb76843e71c4d52d35 (diff) | |
| parent | 0db0c9519402e43d2aa6d89386d227282d23e015 (diff) | |
| download | device_google_taimen-2339e6a36ee40563fcc160baf96a4bdc47ec76b3.tar.gz device_google_taimen-2339e6a36ee40563fcc160baf96a4bdc47ec76b3.tar.bz2 device_google_taimen-2339e6a36ee40563fcc160baf96a4bdc47ec76b3.zip | |
Snap for 4801384 from 0db0c9519402e43d2aa6d89386d227282d23e015 to pi-release
Change-Id: I08c8ff44e568cd0339536b23b80d30ec09b8511a
| -rw-r--r-- | aosp_taimen.mk | 3 | ||||
| -rw-r--r-- | audio_platform_info_tavil.xml | 2 | ||||
| -rw-r--r-- | mixer_paths_tavil.xml | 20 |
3 files changed, 24 insertions, 1 deletions
diff --git a/aosp_taimen.mk b/aosp_taimen.mk index fa46a05..5f2c414 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -30,7 +30,8 @@ PRODUCT_PACKAGES += \ vndk_package PRODUCT_COPY_FILES += \ - device/google/taimen/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/taimen/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml PRODUCT_RESTRICT_VENDOR_FILES := owner diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 91b2dd1..846e305 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -86,7 +86,9 @@ <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/> <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/> <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/> + <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/> <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/> + <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/> <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_USB" backend="usb-headset" interface="USB_AUDIO_RX"/> <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_USB" backend="voice-tty-vco-usb" interface="USB_AUDIO_RX"/> <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="voice-tty-hco-handset" interface="QUAT_MI2S_RX"/> diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 920552c..46c5a68 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -1861,6 +1861,26 @@ <path name="handset-mic" /> </path> + <path name="speaker-and-bt-sco"> + <path name="speaker"/> + <path name="bt-sco-headset"/> + </path> + + <path name="speaker-and-bt-sco-wb"> + <path name="speaker"/> + <path name="bt-sco-headset-wb"/> + </path> + + <path name="speaker-safe-and-bt-sco"> + <path name="speaker-safe"/> + <path name="bt-sco-headset"/> + </path> + + <path name="speaker-safe-and-bt-sco-wb"> + <path name="speaker-safe"/> + <path name="bt-sco-headset-wb"/> + </path> + <path name="bt-sco-headset"> </path> |