diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:25:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:25:55 +0000 |
| commit | 292017f30876de42953d4cb38b18915cbc5cd208 (patch) | |
| tree | 0bd57241eaf102028baec73f0a1f40c5d8b03ba5 | |
| parent | 123685b116d10fa57941ae2eb62110a45c44b59b (diff) | |
| parent | 694505bb7a836e85e6a83c98e7c8c7fc5e29a566 (diff) | |
release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release-4253898 snap-temp-L09600000090287887
Change-Id: Ic11b9f4f5fac9a607dc4c8a5ab3b2475da91b63d
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | mixer_paths_tavil.xml | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk index fccfefe..b9150a9 100644 --- a/device-common.mk +++ b/device-common.mk @@ -126,3 +126,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.hwui.text_small_cache_height=1024 \ ro.hwui.text_large_cache_width=2048 \ ro.hwui.text_large_cache_height=1024 + +# NFC/camera interaction workaround - DO NOT COPY TO NEW DEVICES +PRODUCT_PROPERTY_OVERRIDES += \ + ro.camera.notify_nfc=1 diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 794de6b..f509fe2 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -1127,11 +1127,19 @@ <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="1" /> </path> + <path name="voicemmode1-call speaker-and-bt-sco"> + <path name="voicemmode1-call bt-sco" /> + </path> + <path name="voicemmode1-call bt-sco-wb"> <ctl name="BT SampleRate" value="KHZ_16" /> <path name="voicemmode1-call bt-sco" /> </path> + <path name="voicemmode1-call speaker-and-bt-sco-wb"> + <path name="voicemmode1-call bt-sco-wb" /> + </path> + <path name="voicemmode1-call afe-proxy"> <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" /> <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" /> @@ -1147,6 +1155,10 @@ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> </path> + <path name="voicemmode1-call speaker-and-usb-headphones"> + <path name="voicemmode1-call usb-headphones" /> + </path> + <path name="voicemmode1-call voice-tty-hco-handset"> <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="1" /> <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> |