From 661f4cc1b8fde4119a351fbe5b9d6df2a537e67a Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 6 May 2022 17:18:00 +0800
Subject: [PATCH 1/2] audio: allow mmap-record to set dsp volume

Bug: 231630423
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ia85b57a58d732bc0c18108dfab610145b0455c7e
---
 audio/felix/config/audio_platform_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml
index 9a55347..195e659 100644
--- a/audio/felix/config/audio_platform_configuration.xml
+++ b/audio/felix/config/audio_platform_configuration.xml
@@ -197,7 +197,7 @@
         <!-- for input wit AUDIO_INPUT_FLAG_FAST  480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
         <usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
-        <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
+        <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
         <!-- for hifi -->
         <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
         <usecase id="UC_HIFI_RECORD" dev1="26"/>

From 34ec640b3b2d9609eb4e178db0842a4e56be9d3b Mon Sep 17 00:00:00 2001
From: davidycchen <davidycchen@google.com>
Date: Tue, 10 May 2022 13:01:12 +0800
Subject: [PATCH 2/2] F10: Disable twoshay as default.

Temporary disble the twoshay service for bring up stage.

Bug: 232043149
Test: touch is workable after stop twoshay.

Signed-off-by: davidycchen <davidycchen@google.com>
Change-Id: I5a216458b6d8692c530fca31ff44dd53697593c5
---
 conf/init.felix.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index a422cfc..e5b95a6 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -21,7 +21,7 @@ on property:vendor.device.modules.ready=1
     chmod 660 /dev/touch_offload_fts
     chmod 660 /dev/touch_offload_fts_ext
     # Start the twoshay touch service
-    start twoshay
+    # start twoshay
 
 # Toggle glove_mode according to touch_sensitivity_mode
 on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1