From bdb48f2549a7b9ed9d67a28072a195908a63bbdc Mon Sep 17 00:00:00 2001 From: George Date: Sun, 19 Feb 2023 20:20:20 +0800 Subject: [PATCH] [eSE] Update AIDL secure_element for eSE1 Bug: 261566299 Test: run cts -m CtsOmapiTestCases Test: atest VtsAidlHalNfcTargetTest Change-Id: I69d11b1a5e111d8c8500ac2872998c53dde10075 --- device-husky.mk | 5 +---- device-ripcurrent.mk | 5 +---- device-shiba.mk | 5 +---- nfc/manifest_se.xml | 7 ------- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 nfc/manifest_se.xml diff --git a/device-husky.mk b/device-husky.mk index 839ef05..b26c9f7 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -75,16 +75,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/shusky/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf -DEVICE_MANIFEST_FILE += \ - device/google/shusky/nfc/manifest_se.xml - # Thermal Config PRODUCT_COPY_FILES += \ device/google/shusky/thermal_info_config_husky.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 3286cd0..047d1b3 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -67,16 +67,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/shusky/nfc/libse-gto-hal-disable.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf -DEVICE_MANIFEST_FILE += \ - device/google/shusky/nfc/manifest_se.xml - # Thermal Config PRODUCT_COPY_FILES += \ device/google/shusky/thermal_info_config_ripcurrent.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ diff --git a/device-shiba.mk b/device-shiba.mk index 76c77a3..b979925 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -66,16 +66,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/shusky/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf -DEVICE_MANIFEST_FILE += \ - device/google/shusky/nfc/manifest_se.xml - # Thermal Config PRODUCT_COPY_FILES += \ device/google/shusky/thermal_info_config_shiba.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 @@ - - - android.hardware.secure_element - hwbinder - @1.2::ISecureElement/eSE1 - -