diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-30 20:33:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-30 20:33:35 +0000 |
| commit | 4b9871b75730c7035d2759184302f0ed9c2b00bc (patch) | |
| tree | b3ddb95b3959ce98a027d1364d89142eeb4fcc91 | |
| parent | 8706354bd505864d1d72168acd83492dfe209eaf (diff) | |
| parent | 115aa5c10011509b45c9021a75c0015eb4822514 (diff) | |
| download | crosshatch-4b9871b75730c7035d2759184302f0ed9c2b00bc.tar.gz | |
Merge "Update nfc@1.1 hal to nfc@1.2 and disable P2P polling mask" into qt-dev
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | manifest.xml | 2 | ||||
| -rw-r--r-- | nfc/libnfc-nci.conf | 10 | ||||
| -rw-r--r-- | nfc/libnfc-nxp.blueline.conf | 17 | ||||
| -rw-r--r-- | nfc/libnfc-nxp.crosshatch.conf | 17 |
5 files changed, 43 insertions, 5 deletions
@@ -407,7 +407,7 @@ PRODUCT_PACKAGES += \ NfcNci \ Tag \ SecureElement \ - android.hardware.nfc@1.1-service \ + android.hardware.nfc@1.2-service \ android.hardware.secure_element@1.1-service-disabled PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/manifest.xml b/manifest.xml index 4ceccc69..527954da 100644 --- a/manifest.xml +++ b/manifest.xml @@ -255,7 +255,7 @@ <hal format="hidl"> <name>android.hardware.nfc</name> <transport>hwbinder</transport> - <version>1.1</version> + <version>1.2</version> <interface> <name>INfc</name> <instance>default</instance> diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf index 32009ada..2dea7b6a 100644 --- a/nfc/libnfc-nci.conf +++ b/nfc/libnfc-nci.conf @@ -41,7 +41,7 @@ SCREEN_OFF_POWER_STATE=1 # NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ # NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ # NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -POLLING_TECH_MASK=0x6F +POLLING_TECH_MASK=0x2F ############################################################################### # Force P2P to only listen for the following technology(s). @@ -54,7 +54,7 @@ POLLING_TECH_MASK=0x6F # NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ # NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ # NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -P2P_LISTEN_TECH_MASK=0x41 +P2P_LISTEN_TECH_MASK=0x00 PRESERVE_STORAGE=0x01 @@ -84,5 +84,9 @@ AID_MATCHING_MODE=0x01 DEFAULT_FELICA_SYS_CODE={FE:FE} ############################################################################### +#Set if the AID routing should be blocked for the power modes not supported. +NFA_AID_BLOCK_ROUTE=1 + +############################################################################### # Power state for off host AID routing -OFFHOST_AID_ROUTE_PWR_STATE=0x39 +OFFHOST_AID_ROUTE_PWR_STATE=0x3B diff --git a/nfc/libnfc-nxp.blueline.conf b/nfc/libnfc-nxp.blueline.conf index 0691068f..e3b28312 100644 --- a/nfc/libnfc-nxp.blueline.conf +++ b/nfc/libnfc-nxp.blueline.conf @@ -321,6 +321,23 @@ OFF_HOST_SIM_PIPE_ID=0x0A # bit pos 5 = Screen Off lock DEFAULT_SYS_CODE_PWR_STATE=0x3B +############################################################################### +# Configure the NFCEEIDs of offhost UICC. +# UICC 0x80 (UICC) +OFFHOST_ROUTE_UICC={80} + +############################################################################### +# Configure the NFCEEIDs of offhost eSEs. +# eSE 0xC0 (eSE) +OFFHOST_ROUTE_ESE={C0} + +############################################################################### +# Configure the list of NFCEE for the ISO-DEP routing. +# host 0x00 +# eSE 0xC0 (eSE) +# UICC 0x80 (UICC) +DEFAULT_ISODEP_ROUTE=0x80 + ############################################################################## # Update Phase tirm offset signbit NXP_PHASE_TIRM_OFFSET_SIGN_UPDATE=0x01 diff --git a/nfc/libnfc-nxp.crosshatch.conf b/nfc/libnfc-nxp.crosshatch.conf index 7b5f4585..8ea172fe 100644 --- a/nfc/libnfc-nxp.crosshatch.conf +++ b/nfc/libnfc-nxp.crosshatch.conf @@ -321,6 +321,23 @@ OFF_HOST_SIM_PIPE_ID=0x0A DEFAULT_SYS_CODE_PWR_STATE=0x3B ############################################################################### +# Configure the NFCEEIDs of offhost UICC. +# UICC 0x80 (UICC) +OFFHOST_ROUTE_UICC={80} + +############################################################################### +# Configure the NFCEEIDs of offhost eSEs. +# eSE 0xC0 (eSE) +OFFHOST_ROUTE_ESE={C0} + +############################################################################### +# Configure the list of NFCEE for the ISO-DEP routing. +# host 0x00 +# eSE 0xC0 (eSE) +# UICC 0x80 (UICC) +DEFAULT_ISODEP_ROUTE=0x80 + +############################################################################### # Update Phase tirm offset signbit NXP_PHASE_TIRM_OFFSET_SIGN_UPDATE=0x01 |