Update nfc@1.1 hal to nfc@1.2 and disable P2P polling mask

Bug: 130509605
Test: Nfc on/off, CE/Tag
Change-Id: Iaa2e0b3ac4864d25f6ddd959f42fa1c2fd8bfb79
Merged-In: Iaa2e0b3ac4864d25f6ddd959f42fa1c2fd8bfb79
diff --git a/device.mk b/device.mk
index dab7da2..250c094 100644
--- a/device.mk
+++ b/device.mk
@@ -380,7 +380,7 @@
     NfcNci \
     Tag \
     SecureElement \
-    android.hardware.nfc@1.1-service \
+    android.hardware.nfc@1.2-service \
     android.hardware.secure_element@1.1-service-disabled
 
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
diff --git a/manifest.xml b/manifest.xml
index c120eff..0115d5a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -246,7 +246,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 32009ad..2dea7b6 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -41,7 +41,7 @@
 # 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 @@
 # 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 @@
 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 4a2213a..e3b2831 100644
--- a/nfc/libnfc-nxp.blueline.conf
+++ b/nfc/libnfc-nxp.blueline.conf
@@ -176,7 +176,7 @@
     A0, 38, 04, 14, 0B, 0B, 00,
     A0, 3A, 08, 0A, 00, 0A, 00, 0A, 00, 0A, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 00
+    A0, 91, 01, 01
 }
 
 ###############################################################################
@@ -321,6 +321,23 @@
 # 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 95477e4..8ea172f 100644
--- a/nfc/libnfc-nxp.crosshatch.conf
+++ b/nfc/libnfc-nxp.crosshatch.conf
@@ -175,7 +175,7 @@
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 96, 00, 96, 00, 96, 00, 96, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 00
+    A0, 91, 01, 01
 }
 
 ###############################################################################
@@ -321,6 +321,23 @@
 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