Enable eSE2 and ctsmode settings
turn on st33spi when persist.vendor.se.ese2.mode is set to ctsmode
Bug: 193417907
Test: VtsHalSecureElementV1_2TargetTest,
VtsHalSecureElementV1_1TargetTest,
VtsHalSecureElementV1_0TargetTest,
CtsOmapiTestCases
Change-Id: I38d9d4c44bb5fd59e2f709b3046f74c1b2483eea
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index ed55764..cb70c03 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -52,3 +52,7 @@
on property:ro.revision=PROTO1.0
setprop persist.fingerprint.ghbm true
+
+# SecureElement eSE2 cts mode
+on property:persist.vendor.se.ese2.mode=ctsmode
+ write /sys/class/st33spi/st33spi/st33spi_state 33
diff --git a/device-oriole.mk b/device-oriole.mk
index 0a61ca6..9e0f8ea 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -114,12 +114,14 @@
# SecureElement
PRODUCT_PACKAGES += \
- android.hardware.secure_element@1.2-service-gto
+ android.hardware.secure_element@1.2-service-gto \
+ android.hardware.secure_element@1.2-service-gto-ese2
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/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
+ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
+ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
diff --git a/device-raven.mk b/device-raven.mk
index 2bf5f3d..33560bb 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -119,17 +119,20 @@
# SecureElement
PRODUCT_PACKAGES += \
- android.hardware.secure_element@1.2-service-gto
+ android.hardware.secure_element@1.2-service-gto \
+ android.hardware.secure_element@1.2-service-gto-ese2
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/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
+ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
+ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml
+
# Vibrator HAL
PRODUCT_PRODUCT_PROPERTIES +=\
ro.vendor.vibrator.hal.long.frequency.shift=15
diff --git a/nfc/manifest_se.xml b/nfc/manifest_se.xml
index 9e5cee9..60dc4c2 100644
--- a/nfc/manifest_se.xml
+++ b/nfc/manifest_se.xml
@@ -3,5 +3,6 @@
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISecureElement/eSE1</fqname>
+ <fqname>@1.2::ISecureElement/eSE2</fqname>
</hal>
</manifest>