Merge cherrypicks of [8689551, 8689566, 8689567, 8690716] into qt-release
Change-Id: If76d9d6d021e63f0d45d1d0d7f444b830a8ca76a
diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 168098b..7c686fb 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -35,7 +35,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=0xEF
+POLLING_TECH_MASK=0x2F
###############################################################################
# Force P2P to only listen for the following technology(s).
@@ -48,7 +48,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=0xC5
+P2P_LISTEN_TECH_MASK=0x00
###############################################################################
# Force UICC to only listen to the following technology(s).