DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I457f7ae5ba1dd3e9eb0c7977876649d5a058265d
diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 0194019..101c821 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -28,6 +28,7 @@
<acdb_ids>
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="14"/>
+ <device name="SND_DEVICE_OUT_VOICE_MUSIC_TX" acdb_id="3"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="14"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="41"/>
<device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="201"/>
diff --git a/init-common.rc b/init-common.rc
index 356c9d8..0dcc3f0 100644
--- a/init-common.rc
+++ b/init-common.rc
@@ -10,11 +10,11 @@
on property:sys.boot_completed=1
# end boot time fs tune
- write /sys/block/sda/queue/read_ahead_kb 1024
+ write /sys/block/sda/queue/read_ahead_kb 128
write /sys/block/sda/queue/nr_requests 128
write /sys/block/sda/queue/iostats 1
- write /sys/block/dm-0/queue/read_ahead_kb 512
- write /sys/block/dm-1/queue/read_ahead_kb 512
+ write /sys/block/dm-0/queue/read_ahead_kb 128
+ write /sys/block/dm-1/queue/read_ahead_kb 128
on property:sys.boot_completed=1 && property:ro.build.type=user
write /proc/sys/kernel/modules_disabled 1
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index c568445..926d74f 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -2215,4 +2215,7 @@
<path name="incall-music-uplink" />
</path>
+ <path name ="voice-music-tx">
+ </path>
+
</mixer>
