Revert "Enable NFC firmware logging by default for user-debug builds" am: 0a1bfe5463
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24626413 Change-Id: I4ff408ddafdb8b45fc22749ac19cfe527212e566 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Victor Liu
Automerger Merge Worker
commit
712d4ac836
4 changed files with 3 additions and 188 deletions
|
|
@ -101,17 +101,10 @@ PRODUCT_COPY_FILES += \
|
|||
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.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
|
||||
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
|
||||
device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \
|
||||
device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
endif
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
|
|
|
|||
|
|
@ -58,16 +58,9 @@ PRODUCT_COPY_FILES += \
|
|||
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/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
|
||||
device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
endif
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
|
|
|
|||
|
|
@ -83,16 +83,9 @@ PRODUCT_COPY_FILES += \
|
|||
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.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
|
||||
device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \
|
||||
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
|
||||
device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf
|
||||
endif
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
|
|
|
|||
|
|
@ -1,164 +0,0 @@
|
|||
########################### Start of libnf-hal-st_aosp.conf ###########################
|
||||
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
# ST HAL trace log level
|
||||
STNFC_HAL_LOGLEVEL=1
|
||||
NFC_DEBUG_ENABLED=0
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific mode to enable FW (RF & SWP) traces.
|
||||
STNFC_FW_DEBUG_ENABLED=1
|
||||
|
||||
###############################################################################
|
||||
# Vendor specific payload size for traces
|
||||
STNFC_FW_RF_LOG_SIZE=15
|
||||
STNFC_FW_SWP_LOG_SIZE=30
|
||||
|
||||
###############################################################################
|
||||
# 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_ALLOW_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
|
||||
|
||||
###############################################################################
|
||||
# Configure the HAL Clock control
|
||||
# enable 0x01
|
||||
# disable 0x00 default value
|
||||
STNFC_CONTROL_CLK=0x01
|
||||
|
||||
###############################################################################
|
||||
# Configure the ACTIVE_RW timer
|
||||
# Default 0x00, set 0x01 to enable it
|
||||
STNFC_ACTIVERW_TIMER=0x01
|
||||
|
||||
###############################################################################
|
||||
# Core configuration settings
|
||||
CORE_CONF_PROP={ 20, 02, 0a, 03,
|
||||
a1, 01, 1e,
|
||||
a2, 01, 19,
|
||||
80, 01, 01
|
||||
}
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue