Remove NFC/SE settings from common gs201
Bug: 199236672 Test: Build pass Change-Id: Ie6a6c90946bb51b2c0e8d644c2c9372b4fc9c357
This commit is contained in:
chloedai
TreeHugger Robot
parent
6306cd9715
commit
2b5427334a
13 changed files with 0 additions and 386 deletions
|
|
@ -53,10 +53,6 @@ on init
|
|||
# Property used by NFC for sku specific configurations
|
||||
setprop ro.boot.product.hardware.sku ${ro.boot.hardware.sku}
|
||||
|
||||
# NFC streset tool name
|
||||
setprop persist.vendor.nfc.streset libstreset21
|
||||
setprop persist.vendor.se.streset libstreset21
|
||||
|
||||
# Support legacy paths
|
||||
symlink /data/app /factory
|
||||
|
||||
|
|
|
|||
|
|
@ -19,12 +19,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
ro.bluetooth.a2dp_offload.supported=true \
|
||||
persist.bluetooth.a2dp_offload.disabled=true \
|
||||
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
|
||||
|
||||
# SecureElement
|
||||
#PRODUCT_PACKAGES += \
|
||||
# android.hardware.secure_element@1.2-service-gto \
|
||||
# android.hardware.secure_element@1.2-service-gto-ese2
|
||||
|
||||
#PRODUCT_COPY_FILES += \
|
||||
# device/google/gs201/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
|
||||
# device/google/gs201/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
|
||||
|
|
|
|||
19
device.mk
19
device.mk
|
|
@ -892,25 +892,6 @@ PRODUCT_PACKAGES_DEBUG += \
|
|||
diag-vibrator-drv2624 \
|
||||
$(NULL)
|
||||
|
||||
# NFC
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
||||
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
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
# SecureElement
|
||||
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
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.health@2.1-impl-gs201 \
|
||||
android.hardware.health@2.1-service
|
||||
|
|
|
|||
|
|
@ -157,15 +157,6 @@
|
|||
<transport>hwbinder</transport>
|
||||
<fqname>@1.3::IDevice/google-edgetpu</fqname>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.nfc</name>
|
||||
<transport>hwbinder</transport>
|
||||
<version>1.2</version>
|
||||
<interface>
|
||||
<name>INfc</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.health</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
|||
|
|
@ -117,15 +117,6 @@
|
|||
</interface>
|
||||
<fqname>@1.3::IDevice/google-armnn</fqname>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.nfc</name>
|
||||
<transport>hwbinder</transport>
|
||||
<version>1.2</version>
|
||||
<interface>
|
||||
<name>INfc</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.health</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
|||
|
|
@ -144,15 +144,6 @@
|
|||
<transport>hwbinder</transport>
|
||||
<fqname>@1.3::IDevice/google-edgetpu</fqname>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.nfc</name>
|
||||
<transport>hwbinder</transport>
|
||||
<version>1.2</version>
|
||||
<interface>
|
||||
<name>INfc</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.health</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
|||
|
|
@ -109,15 +109,6 @@
|
|||
<transport>hwbinder</transport>
|
||||
<fqname>@1.3::IDevice/google-edgetpu</fqname>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.nfc</name>
|
||||
<transport>hwbinder</transport>
|
||||
<version>1.2</version>
|
||||
<interface>
|
||||
<name>INfc</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.health</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
########################### Start of libese-hal-st.conf ###########################
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
# ST HAL trace log level
|
||||
STESE_HAL_LOGLEVEL=1
|
||||
ST_ESE_DEV_NODE="/dev/st54j_se"
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
########################### Start of libnf-hal-st_aosp.conf ###########################
|
||||
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
# ST HAL trace log level
|
||||
STNFC_HAL_LOGLEVEL=4
|
||||
NFC_DEBUG_ENABLED=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific mode to enable FW (RF & SWP) traces.
|
||||
STNFC_FW_DEBUG_ENABLED=0
|
||||
|
||||
###############################################################################
|
||||
# File used for NFA storage
|
||||
NFA_STORAGE="/data/nfc"
|
||||
|
||||
###############################################################################
|
||||
# Dev Node used for ST HAL
|
||||
ST_NFC_DEV_NODE="/dev/st_no_such_device"
|
||||
|
||||
###############################################################################
|
||||
# Keep the nfa storage file.
|
||||
PRESERVE_STORAGE=1
|
||||
|
||||
###############################################################################
|
||||
# In Switch OFF mode (phone switched-off), specify the desired CE mode to
|
||||
# the controller.
|
||||
# 0: No card-emulation; DEFAULT
|
||||
# 1: Switch-off card-emulation enabled
|
||||
CE_ON_SWITCH_OFF_STATE=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
|
||||
STNFC_USB_CHARGING_MODE=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor Specific Proprietary Protocol & Discovery Configuration
|
||||
# Set to 0xFF if unsupported
|
||||
# byte[0] NCI_PROTOCOL_18092_ACTIVE
|
||||
# byte[1] NCI_PROTOCOL_B_PRIME
|
||||
# byte[2] NCI_PROTOCOL_DUAL
|
||||
# byte[3] NCI_PROTOCOL_15693
|
||||
# byte[4] NCI_PROTOCOL_KOVIO
|
||||
# byte[5] NCI_PROTOCOL_MIFARE
|
||||
# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
|
||||
# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
|
||||
# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
|
||||
NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
|
||||
|
||||
###############################################################################
|
||||
# Choose the presence-check algorithm for type-4 tag. If not defined,
|
||||
# the default value is 1.
|
||||
# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
|
||||
# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
|
||||
# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
|
||||
# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
|
||||
# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
|
||||
# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
|
||||
PRESENCE_CHECK_ALGORITHM=5
|
||||
|
||||
###############################################################################
|
||||
# Name of the NCI HAL module to use
|
||||
# If unset, falls back to nfc_nci.bcm2079x
|
||||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
|
||||
POLL_BAIL_OUT_MODE=1
|
||||
|
||||
###############################################################################
|
||||
# Extended APDU length for ISO_DEP
|
||||
ISO_DEP_MAX_TRANSCEIVE=0xFEFF
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFC Extras to open and use a static pipe. If the value is
|
||||
# not set or set to 0, then the default is use a dynamic pipe based on a
|
||||
# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value
|
||||
# for each EE (ESE/SIM)
|
||||
OFF_HOST_ESE_PIPE_ID=0x5E
|
||||
OFF_HOST_SIM_PIPE_ID=0x3E
|
||||
|
||||
###############################################################################
|
||||
#Set the default Felica T3T System Code OffHost route Location :
|
||||
#This settings will be used when application does not set this parameter
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_SYS_CODE_ROUTE=0x86
|
||||
|
||||
###############################################################################
|
||||
#Set the Felica T3T System Code supported power state:
|
||||
DEFAULT_SYS_CODE_PWR_STATE=0x3B
|
||||
|
||||
###############################################################################
|
||||
# Path and Files used for FW update binaries storage
|
||||
STNFC_FW_PATH_STORAGE="/vendor/firmware"
|
||||
STNFC_FW_BIN_NAME="/st54j_fw.bin"
|
||||
STNFC_FW_CONF_NAME="/st54j_conf.bin"
|
||||
|
||||
###############################################################################
|
||||
# Default off-host route for Felica.
|
||||
# This settings will be used when application does not set this parameter
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_NFCF_ROUTE=0x86
|
||||
|
||||
###############################################################################
|
||||
# Configure the default off-host route.
|
||||
# used for technology A and B routing
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_OFFHOST_ROUTE=0x81
|
||||
|
||||
###############################################################################
|
||||
# Configure the default AID route.
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_ROUTE=0x00
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFCEEIDs of offhost UICC.
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
OFFHOST_ROUTE_UICC={81}
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFCEEIDs of offhost eSEs.
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
OFFHOST_ROUTE_ESE={86}
|
||||
|
||||
###############################################################################
|
||||
# Configure the list of NFCEE for the ISO-DEP routing.
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_ISODEP_ROUTE=0x81
|
||||
|
||||
###############################################################################
|
||||
# Core configuration settings
|
||||
CORE_CONF_PROP={ 20, 02, 0a, 03,
|
||||
a1, 01, 1e,
|
||||
a2, 01, 19,
|
||||
80, 01, 01
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,148 +0,0 @@
|
|||
########################### Start of libnf-hal-st_aosp.conf ###########################
|
||||
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
# ST HAL trace log level
|
||||
STNFC_HAL_LOGLEVEL=1
|
||||
NFC_DEBUG_ENABLED=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific mode to enable FW (RF & SWP) traces.
|
||||
STNFC_FW_DEBUG_ENABLED=0
|
||||
|
||||
###############################################################################
|
||||
# File used for NFA storage
|
||||
NFA_STORAGE="/data/nfc"
|
||||
|
||||
###############################################################################
|
||||
# Keep the nfa storage file.
|
||||
PRESERVE_STORAGE=1
|
||||
|
||||
###############################################################################
|
||||
# In Switch OFF mode (phone switched-off), specify the desired CE mode to
|
||||
# the controller.
|
||||
# 0: No card-emulation; DEFAULT
|
||||
# 1: Switch-off card-emulation enabled
|
||||
CE_ON_SWITCH_OFF_STATE=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
|
||||
STNFC_USB_CHARGING_MODE=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor Specific Proprietary Protocol & Discovery Configuration
|
||||
# Set to 0xFF if unsupported
|
||||
# byte[0] NCI_PROTOCOL_18092_ACTIVE
|
||||
# byte[1] NCI_PROTOCOL_B_PRIME
|
||||
# byte[2] NCI_PROTOCOL_DUAL
|
||||
# byte[3] NCI_PROTOCOL_15693
|
||||
# byte[4] NCI_PROTOCOL_KOVIO
|
||||
# byte[5] NCI_PROTOCOL_MIFARE
|
||||
# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
|
||||
# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
|
||||
# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
|
||||
NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
|
||||
|
||||
###############################################################################
|
||||
# Choose the presence-check algorithm for type-4 tag. If not defined,
|
||||
# the default value is 1.
|
||||
# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
|
||||
# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
|
||||
# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
|
||||
# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
|
||||
# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
|
||||
# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
|
||||
PRESENCE_CHECK_ALGORITHM=5
|
||||
|
||||
###############################################################################
|
||||
# Name of the NCI HAL module to use
|
||||
# If unset, falls back to nfc_nci.bcm2079x
|
||||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
|
||||
POLL_BAIL_OUT_MODE=1
|
||||
|
||||
###############################################################################
|
||||
# Extended APDU length for ISO_DEP
|
||||
ISO_DEP_MAX_TRANSCEIVE=0xFEFF
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFC Extras to open and use a static pipe. If the value is
|
||||
# not set or set to 0, then the default is use a dynamic pipe based on a
|
||||
# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value
|
||||
# for each EE (ESE/SIM)
|
||||
OFF_HOST_ESE_PIPE_ID=0x5E
|
||||
OFF_HOST_SIM_PIPE_ID=0x3E
|
||||
|
||||
###############################################################################
|
||||
#Set the default Felica T3T System Code OffHost route Location :
|
||||
#This settings will be used when application does not set this parameter
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_SYS_CODE_ROUTE=0x86
|
||||
|
||||
###############################################################################
|
||||
#Set the Felica T3T System Code supported power state:
|
||||
DEFAULT_SYS_CODE_PWR_STATE=0x3B
|
||||
|
||||
###############################################################################
|
||||
# Path and Files used for FW update binaries storage
|
||||
STNFC_FW_PATH_STORAGE="/vendor/firmware"
|
||||
STNFC_FW_BIN_NAME="/st54j_fw.bin"
|
||||
STNFC_FW_CONF_NAME="/st54j_conf.bin"
|
||||
|
||||
###############################################################################
|
||||
# Default off-host route for Felica.
|
||||
# This settings will be used when application does not set this parameter
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_NFCF_ROUTE=0x86
|
||||
|
||||
###############################################################################
|
||||
# Configure the default off-host route.
|
||||
# used for technology A and B routing
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_OFFHOST_ROUTE=0x81
|
||||
|
||||
###############################################################################
|
||||
# Configure the default AID route.
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_ROUTE=0x00
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFCEEIDs of offhost UICC.
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
OFFHOST_ROUTE_UICC={81}
|
||||
|
||||
###############################################################################
|
||||
# Configure the NFCEEIDs of offhost eSEs.
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
OFFHOST_ROUTE_ESE={86}
|
||||
|
||||
###############################################################################
|
||||
# Configure the list of NFCEE for the ISO-DEP routing.
|
||||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_ISODEP_ROUTE=0x81
|
||||
|
||||
###############################################################################
|
||||
# Core configuration settings
|
||||
CORE_CONF_PROP={ 20, 02, 0a, 03,
|
||||
a1, 01, 1e,
|
||||
a2, 01, 19,
|
||||
80, 01, 01
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#Gemalto SPI devnode
|
||||
GTO_DEV=/dev/st54spi;
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#Gemalto SPI devnode
|
||||
GTO_DEV=/dev/st33spi;
|
||||
|
|
@ -1,8 +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>
|
||||
<fqname>@1.2::ISecureElement/eSE2</fqname>
|
||||
</hal>
|
||||
</manifest>
|
||||
Loading…
Add table
Add a link
Reference in a new issue