From d37f021213adbd130680b9ba6550b6c883a8aac0 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Thu, 12 May 2022 17:02:34 -0700
Subject: [PATCH 1/3] Add device-specific support for GoogleBattery AIDL V1

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I169436ab06f586079224c0ef3cf2ee8658978882
Merged-In: I169436ab06f586079224c0ef3cf2ee8658978882
---
 manifest.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index aafe372..7edd9e4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,14 +122,13 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.google_battery</name>
-      <transport>hwbinder</transport>
-      <version>1.2</version>
-      <interface>
-        <name>IGoogleBattery</name>
-        <instance>default</instance>
-      </interface>
+    <hal format="aidl">
+        <name>vendor.google.google_battery</name>
+        <version>1</version>
+        <interface>
+            <name>IGoogleBattery</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>

From a18f357b382c4157357ef9624c30d690c267bb6c Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Tue, 28 Jun 2022 16:56:37 +0800
Subject: [PATCH 2/3] Set audio haptic channel amplitude limit

Bug: 236709186
Test: dumpsys vibrator_manager
Change-Id: I8e1555c29aa2f617d49b277d13bdfc74303d341f
---
 felix/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml
index 0fbd648..9e431d1 100644
--- a/felix/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml
@@ -187,6 +187,9 @@
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
+    <!-- The max vibration strength allowed in audio haptic channels. -->
+    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.39</item>
+
     <!-- Not allow to switch to higher refresh rate when display brightness setting is
          equal or less than this value -->
     <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">

From 0ef45fff006c3c80c1d16fedfa14825833ac453f Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 28 Jul 2022 14:39:43 +0800
Subject: [PATCH 3/3] Remove NFC uicc card emulation mode support

Correct the nfc feature flag declaration.

Bug: 240225338
Bug: 222030531
Test: manual
Change-Id: I229186c0a47ccae35bd200286f520a5a108fc784
---
 device-felix.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index 3b68fab..c2d050b 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -76,7 +76,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
 	frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
 	frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \
-	frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
 	frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
 	device/google/felix/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
 	device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf