From 51b2160f2bfb122f08c37bc02609a1f55a575873 Mon Sep 17 00:00:00 2001
From: Ahmed ElArabawy <arabawy@google.com>
Date: Fri, 19 Jan 2018 14:16:41 -0800
Subject: [PATCH 1/3] WiFi: Modify name of configuration to enable SAR

This commit modifies the name of the configuration to enable
SAR to adjust to the new configurations to make it more representative

Bug: 65174506
Test: Manual

Change-Id: Id198cd899db7d93458da083a78985b7d72f0fad5
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
---
 .../overlay/frameworks/base/core/res/res/values/config.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
index 8fafad7..93d1a80 100644
--- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
@@ -179,9 +179,9 @@
         <item>8</item>
     </integer-array>
 
-    <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR requirements
-         during voice calls -->
-    <bool translatable="false" name="config_wifi_framework_enable_voice_call_sar_tx_power_limit">true</bool>
+    <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR
+         requirements -->
+    <bool translatable="false" name="config_wifi_framework_enable_sar_tx_power_limit">true</bool>
 
     <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
     <bool name="config_displayBlanksAfterDoze">true</bool>

From 0f1811415f16ea315ab27900c692a7851f018600 Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Thu, 26 Jul 2018 13:47:13 -0700
Subject: [PATCH 2/3] Set runtime readahead to 128KiB

Reduce readahead to 128KiB to reduce thrashing under memory pressure.

Bug: 110908295
Bug: 111855179
Test: Boot
Change-Id: I449d2733bc836ed7661653efb2400fc031a76644
(cherry picked from commit bed30a438faf4e9c4eabc51edf86ef1a97d00385)
---
 init-common.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 late-fs
 
 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

From bc4ca56e64e97f607ebe9d4c06f4a5da1362a0b8 Mon Sep 17 00:00:00 2001
From: juyuchen <juyuchen@google.com>
Date: Wed, 8 Aug 2018 11:44:33 +0800
Subject: [PATCH 3/3] audio: the table for in-call music.

Bug: 111107345
Test: manual audio test.

Change-Id: I84412f92fabd975e9c82033fd6f3d1a02bc4147d
Signed-off-by: juyuchen <juyuchen@google.com>
---
 audio_platform_info_tavil.xml | 1 +
 mixer_paths_tavil.xml         | 3 +++
 2 files changed, 4 insertions(+)

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/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>