Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I9a604d57b9f7c1152da74306e59022182f825d70
diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 846e305..f877f24 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -29,6 +29,7 @@
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
<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_HANDSET_TMUS" acdb_id="7"/>
<device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="41"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" acdb_id="19"/>
diff --git a/device.mk b/device.mk
index 6335298..f3a4787 100644
--- a/device.mk
+++ b/device.mk
@@ -132,5 +132,7 @@
# Early phase offset for SurfaceFlinger (b/75985430)
PRODUCT_PROPERTY_OVERRIDES += \
- debug.sf.early_phase_offset_ns=5000000
+ debug.sf.early_phase_offset_ns=1000000
+PRODUCT_PROPERTY_OVERRIDES += \
+ debug.sf.early_gl_phase_offset_ns=1000000
diff --git a/init-taimen.rc b/init-taimen.rc
index 14c5fc0..e80d49f 100644
--- a/init-taimen.rc
+++ b/init-taimen.rc
@@ -15,14 +15,14 @@
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/sde/queue/read_ahead_kb 1024
+ write /sys/block/sde/queue/read_ahead_kb 128
write /sys/block/sde/queue/nr_requests 128
write /sys/block/sde/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 boot
# Allow ftm4 autotune from adb shell
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 1151590..c702250 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -2366,4 +2366,7 @@
<path name="incall-music-uplink" />
</path>
+ <path name ="voice-music-tx">
+ </path>
+
</mixer>
