From e2e4a77ac7e0a4643c660b14048a43eb0eb47f8d Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 5 May 2022 01:43:38 +0800
Subject: [PATCH 1/3] Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: Ide115013131a79989d36e0a738a2918166192731
Change-Id: Ide115013131a79989d36e0a738a2918166192731
---
 device-felix.mk        |  3 +--
 nfc/libnfc-hal-st.conf |  4 ++--
 nfc/manifest_nfc.xml   | 11 -----------
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 nfc/manifest_nfc.xml

diff --git a/device-felix.mk b/device-felix.mk
index 85c73cc..9b36ffb 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -85,7 +85,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -99,7 +99,6 @@ PRODUCT_COPY_FILES += \
 	device/google/felix/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/felix/nfc/manifest_nfc.xml \
 	device/google/felix/nfc/manifest_se.xml
 
 # Power HAL config
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 0035a70..b7599c7 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
 NCI_HAL_MODULE="nfc_nci.st21nfc"
 
 ###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P
diff --git a/nfc/manifest_nfc.xml b/nfc/manifest_nfc.xml
deleted file mode 100644
index bf6b7cc..0000000
--- a/nfc/manifest_nfc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-  <hal format="hidl">
-    <name>android.hardware.nfc</name>
-    <transport>hwbinder</transport>
-    <version>1.2</version>
-    <interface>
-      <name>INfc</name>
-      <instance>default</instance>
-      </interface>
-  </hal>
-</manifest>

From f18fb6672735124d4dfdc7e3d002695a27a3c603 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 26 May 2022 17:18:59 +0800
Subject: [PATCH 2/3] Remove Nfc hidl settings

Nfc uses aidl now

Bug: 216290344
Test: manual
Merged-In: I47f377b5bc7d1154d07ab34613c8c2deb2a54c1e
Change-Id: I47f377b5bc7d1154d07ab34613c8c2deb2a54c1e
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 73b4e42..aafe372 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -113,15 +113,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

From f55e335f12452c78fa5f5d9d6d8b2e8d2bc4ccc8 Mon Sep 17 00:00:00 2001
From: YB_Chiu <yubinc@google.com>
Date: Tue, 31 May 2022 17:25:27 +0800
Subject: [PATCH 3/3] add mic software gain initial value

sync the solution from C10/P10

Bug: 234337030
Test: verify it with a updated mixr table, and it works
Change-Id: I74272c762961731156e11c4aa4b003e5eaf536a5
Signed-off-by: YB_Chiu <yubinc@google.com>
---
 audio/felix/config/mixer_paths_factory.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/audio/felix/config/mixer_paths_factory.xml b/audio/felix/config/mixer_paths_factory.xml
index 961fd90..1a44ee1 100644
--- a/audio/felix/config/mixer_paths_factory.xml
+++ b/audio/felix/config/mixer_paths_factory.xml
@@ -8,6 +8,7 @@
     <ctl name="E Main AMP Enable Switch" value="0" />
     <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
 
     <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
     <ctl name="DEFAULT_MIC_ID" value="0" />