From 97f89f5da36183d10905e1f590d286c831958974 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 28 Jul 2022 14:36:36 +0800
Subject: [PATCH 1/2] Remove NFC uicc card emulation mode support

Correct the nfc feature flag declaration.

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

diff --git a/device-lynx.mk b/device-lynx.mk
index dd39427..fd31000 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -62,7 +62,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/lynx/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
     device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf

From 4f5438d52cbcdc0e41e052fc8905103421ba0cf6 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Wed, 20 Jul 2022 22:15:47 +0000
Subject: [PATCH 2/2] Remove device-specific support for GoogleBattery HAL

This is covered by parent projects.

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I4f8bf22fc2cbde580d1fa4058210b357f24c2bb5
Merged-In: If97f5a5f3f082e2066f1d512f449fcbb295b50f2
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 8321c15..5909ae3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -113,15 +113,6 @@
             <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>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>