From b0720a4f3d3518e20289f8ee2ca582d27bac005f Mon Sep 17 00:00:00 2001
From: George <georgekgchang@google.com>
Date: Tue, 11 Apr 2023 10:37:33 +0800
Subject: [PATCH] [eSE] Update AIDL secure_element for eSE1

Bug: 261566299
Test: run cts -m CtsOmapiTestCases
Test: atest VtsAidlHalNfcTargetTest
Change-Id: I869dae115bf18f795f25d2cd79a7fafbd4f9b767
---
 device-akita.mk     | 5 +----
 nfc/manifest_se.xml | 7 -------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 nfc/manifest_se.xml

diff --git a/device-akita.mk b/device-akita.mk
index 738a7d4..2966ca8 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -68,16 +68,13 @@ PRODUCT_PACKAGES += \
 
 # SecureElement
 PRODUCT_PACKAGES += \
-	android.hardware.secure_element@1.2-service-gto
+	android.hardware.secure_element-service.thales
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
 	frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
 	device/google/akita/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
 
-DEVICE_MANIFEST_FILE += \
-	device/google/akita/nfc/manifest_se.xml
-
 # Thermal Config
 PRODUCT_COPY_FILES += \
 	device/google/akita/thermal_info_config_akita.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
diff --git a/nfc/manifest_se.xml b/nfc/manifest_se.xml
deleted file mode 100644
index 39fe63e..0000000
--- a/nfc/manifest_se.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.secure_element</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISecureElement/eSE1</fqname>
-    </hal>
-</manifest>