From 665398800bbcfa5270b5966a527c679da1b47dea Mon Sep 17 00:00:00 2001
From: Kris Chen <chenkris@google.com>
Date: Thu, 13 May 2021 19:46:02 +0800
Subject: [PATCH 1/3] Disable ASP only on PROTO1.0 devices

Bug: 188193525
Test: ASP is disabled on PROTO1.0.
Test: ASP is enabled on PROTO1.1 and newer.
Change-Id: Ib01547cdf27431f3c475cff3830f077b044fcea5
---
 conf/init.raviole.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index f4e2e94..aa0c4fc 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -8,8 +8,9 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_raviole
 
-# Disables fingerprint antispoof by default
+# Disables fingerprint antispoof on PROTO1.0 devices
 on boot && property:ro.build.type=userdebug && \
+           property:ro.revision=PROTO1.0 && \
            property:persist.vendor.fingerprint.disable.fake.override=none
     setprop vendor.fingerprint.disable.fake 100
 

From bbc1857804d1154137da4628d8eafc8e83ca4f34 Mon Sep 17 00:00:00 2001
From: Vince Leung <leungv@google.com>
Date: Thu, 13 May 2021 16:01:13 -0700
Subject: [PATCH 2/3] audio: route haptic EP to haptic backend

Bug: 178431048
Test: manually verify audio-coupled-haptics is working for Pixel
ringtones on P21 devices

Change-Id: I54a7dbe713e03af031036534f2dba388903ea81e
---
 audio/oriole/config/mixer_paths.xml | 8 ++++++++
 audio/raven/config/mixer_paths.xml  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 07cf8e0..aac3f57 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -35,6 +35,14 @@
     <ctl name="TDM_0_TX Chan" value="Four"/>
     <ctl name="TDM_0_TX Format" value="S32_LE"/>
 
+    <!-- Haptic setting -->
+    <ctl name="HAPTIC_RX Format" value="S32_LE"/>
+    <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
+    <ctl name="HAPTIC_RX Chan" value="Four"/>
+    <ctl name="HAPTIC_RX nSlot" value="Four"/>
+    <ctl name="RX Slots" id="0" value="2"/>
+    <ctl name="RX Slots" id="1" value="3"/>
+
     <!-- Cirrus Booster Amp TDM slot assignment-->
     <!-- RX slot -->
     <ctl name="ASPRX1 Slot Position" value="0"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 240749c..858d25f 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -35,6 +35,14 @@
     <ctl name="TDM_0_TX Chan" value="Four"/>
     <ctl name="TDM_0_TX Format" value="S32_LE"/>
 
+    <!-- Haptic setting -->
+    <ctl name="HAPTIC_RX Format" value="S32_LE"/>
+    <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
+    <ctl name="HAPTIC_RX Chan" value="Four"/>
+    <ctl name="HAPTIC_RX nSlot" value="Four"/>
+    <ctl name="RX Slots" id="0" value="2"/>
+    <ctl name="RX Slots" id="1" value="3"/>
+
     <!-- Cirrus Booster Amp TDM slot assignment-->
     <!-- RX slot -->
     <ctl name="ASPRX1 Slot Position" value="0"/>

From 0a6e699f5165cbb1eea6e987618c1140b211f689 Mon Sep 17 00:00:00 2001
From: Vince Leung <leungv@google.com>
Date: Fri, 14 May 2021 02:48:24 +0000
Subject: [PATCH 3/3] Revert "Remove audio-coupled-haptics support"

This reverts commit fd3f4173520166b3c397bcc9efb53dc5d449b6f2.

Reason for revert: functional implementation of audio coupled haptics feature working again

Bug: 178431048
Test: manually verify audio-coupled-haptics is working for Pixel
ringtones on P21 devices

Change-Id: Ibda582e6b4f95dcf9bd5497dbc3580eb1569f9a2
---
 audio/oriole/config/audio_policy_configuration.xml | 12 +++++-------
 audio/raven/config/audio_policy_configuration.xml  | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 62f5b9d..50dba03 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -48,13 +48,11 @@
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                 </mixPort>
-                <!-- TODO(186720581): revert this change when b/178431048 is fixed
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
                 </mixPort>
-                -->
                 <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -176,11 +174,11 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT A2DP Out"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT A2DP Headphones"
@@ -188,9 +186,9 @@
                 <route type="mix" sink="BT A2DP Speaker"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 62f5b9d..50dba03 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -48,13 +48,11 @@
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                 </mixPort>
-                <!-- TODO(186720581): revert this change when b/178431048 is fixed
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
                 </mixPort>
-                -->
                 <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -176,11 +174,11 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT A2DP Out"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT A2DP Headphones"
@@ -188,9 +186,9 @@
                 <route type="mix" sink="BT A2DP Speaker"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT SCO Headset"