sdm660-common: Update NFC configs

* from UL-ASUS_X01BD-WW-17.2018.2004.424-user build
* Uprev nfc hal

Change-Id: Ic96e04c05ba230a96bc8e1b042faf1b0d5ded5db

configs/manifests/manifest.xml

@@ -231,7 +231,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <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>
@@ -560,24 +560,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>qti.ims.connectionmanagerservice</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpese</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpEse</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpnfc</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpNfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>

configs/nfc/libnfc-nci.conf

@@ -1,4 +1,4 @@
-###################### Start of libnfc-nci.conf #######################
+###################### Start of libnfc-common.conf #######################
 
 ###############################################################################
 # Application options
@@ -9,19 +9,19 @@ NFC_DEBUG_ENABLED=0x01
 
 ###############################################################################
 # File used for NFA storage
-NFA_STORAGE="/data/vendor/nfc"
-
-###############################################################################
-# Configure the default Destination Gate used by HCI (the default is 4, which
-# is the ETSI loopback gate.
-NFA_HCI_DEFAULT_DEST_GATE=0xF0
+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
 
+###############################################################################
+# Configure the default Destination Gate used by HCI (the default is 4, which
+# is the ETSI loopback gate.
+NFA_HCI_DEFAULT_DEST_GATE=0xF0
+
 ###############################################################################
 # Forcing HOST to listen for a selected protocol
 # 0x00 : Disable Host Listen
@@ -51,11 +51,18 @@ AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
 SCREEN_OFF_POWER_STATE=1
 
 ###############################################################################
-# Maximum Number of Credits to be allowed by the NFCC
-#   This value overrides what the NFCC specifices allowing the host to have
-#   the control to work-around transport limitations.  If this value does
-#   not exist or is set to 0, the NFCC will provide the number of credits.
-MAX_RF_DATA_CREDITS=1
+# Firmware patch format, Only 1 and 5 should be set
+#   0 -> NFC Default
+#   1 -> EMVCO Default
+#   3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  Removal process
+#   5 -> EMVCO Cert Polling, DISC_IDLE = Removal process  , DISC DEACTIVATE =   POWER_OFF
+#   7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  POWER_OFF
+NFA_CONFIG_FORMAT=1
+
+###############################################################################
+# Default poll duration (in ms)
+#  The defualt is 500ms if not set (see nfc_target.h)
+#NFA_DM_DISC_DURATION_POLL=333
 
 ###############################################################################
 # Force tag polling for the following technology(s).
@@ -91,21 +98,15 @@ P2P_LISTEN_TECH_MASK=0xC5
 PRESERVE_STORAGE=0x01
 
 ###############################################################################
-# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
-# The value is set assumeing discovery of 0x00(Host), 0xC0(Ese) and 0x80(UICC).
-# 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
-NFA_MAX_EE_SUPPORTED=0x02
-
-##############################################################################
 # Deactivate notification wait time out in seconds used in ETSI Reader mode
 # 0 - Infinite wait
-NFA_DM_DISC_NTF_TIMEOUT=100
+NFA_DM_DISC_NTF_TIMEOUT=0
 
 ###############################################################################
 # AID_MATCHING constants
 # AID_MATCHING_EXACT_ONLY 0x00
 # AID_MATCHING_EXACT_OR_PREFIX 0x01
 # AID_MATCHING_PREFIX_ONLY 0x02
 AID_MATCHING_MODE=0x01
+
+###############################################################################