From ef7df93001d6de71fd2f3252af5fbaca9def1cdd Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 10 Mar 2021 19:48:20 +0800 Subject: [PATCH] Remove libnfc-nci from common part Bug: 182243379 Bug: 182351569 Test: build pass Change-Id: Ib853fb48ace452aa4fcb22398e026af433eaec0b --- device.mk | 3 -- nfc/libnfc-nci.conf | 108 -------------------------------------------- 2 files changed, 111 deletions(-) delete mode 100644 nfc/libnfc-nci.conf diff --git a/device.mk b/device.mk index 065d5038..e6cb5178 100644 --- a/device.mk +++ b/device.mk @@ -953,9 +953,6 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc@1.2-service.st -PRODUCT_COPY_FILES += \ - device/google/gs101/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf - # 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 \ diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf deleted file mode 100644 index c4751615..00000000 --- a/nfc/libnfc-nci.conf +++ /dev/null @@ -1,108 +0,0 @@ -############################################################################### -# Application options -NFC_DEBUG_ENABLED=0 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Force UICC to only listen to the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F -UICC_LISTEN_TECH_MASK=0x07 - -############################################################################### -# AID for Empty Select command -# If specified, this AID will be substituted when an Empty SELECT command is -# detected. The first byte is the length of the AID. Maximum length is 16. -AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00} - -############################################################################### -# When screen is turned off, specify the desired power state of the controller. -# 0: power-off-sleep state; DEFAULT -# 1: full-power state -# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) -SCREEN_OFF_POWER_STATE=1 - -############################################################################### -# Force tag polling for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | -# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | -# NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO | -# NFA_TECHNOLOGY_MASK_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ -POLLING_TECH_MASK=0x2F - -############################################################################### -# Force P2P to only listen for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F | -# NFA_TECHNOLOGY_MASK_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ -P2P_LISTEN_TECH_MASK=0x00 - -PRESERVE_STORAGE=0x01 - -############################################################################### -# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. -# The value is set to 3 by default as it assumes we will discover 0xF2, -# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced -# so that the stack will not wait any longer than necessary. -# Maximum EE supported number -# NXP PN547C2 0x02 -# NXP PN65T 0x03 -# NXP PN548C2 0x02 -# NXP PN66T 0x03 -NFA_MAX_EE_SUPPORTED=0x02 - -############################################################################### -# AID_MATCHING constants -# AID_MATCHING_EXACT_ONLY 0x00 -# AID_MATCHING_EXACT_OR_PREFIX 0x01 -# AID_MATCHING_PREFIX_ONLY 0x02 -# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 -AID_MATCHING_MODE=0x03 - -############################################################################### -#Set the default Felica T3T System Code : -#This settings will be used when application does not set this parameter -DEFAULT_SYS_CODE={FE:FE} - -############################################################################### -# Value of NIC parameter NFCC_COFNIG_CONTROL -# 0x00 NFCC is not allowed to manage RF configuration -# 0x01 NFCC is allowed to manage RF configuration -NFCC_CONFIG_CONTROL=0x01 - -############################################################################### -#Set if the AID routing should be blocked for the power modes not supported. -NFA_AID_BLOCK_ROUTE=1 - -############################################################################### -#Set the OffHost AID supported power state: -OFFHOST_AID_ROUTE_PWR_STATE=0x3B - -############################################################################### -# Mifare Tag implementation -# 0: General implementation -# 1: Legacy implementation -LEGACY_MIFARE_READER=0 - -############################################################################### -# Nfc recovery implementation -# 0: Crash Nfc Service -# 1: Toggle Nfc state -RECOVERY_OPTION=1