commit f226bb1f86ec75b098c67cf27f2cb096161a1ee2
author Jack Yu <jackcwyu@google.com> Mon Jul 15 18:13:10 2019 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 19 03:40:53 2019 +0000
tree 08b21f535c3ab0791a9d6468af56866bebfaef40
parent ea787d8c9014024a008a32f84c906d20dda59981

Set default polling mask and p2p listen mask

If mask is not specified in config file, all techs will be enabled by
default.
But some NFCC does not support all techs and cause NFC stack continuously crash.

Bug:137234543
Test: Manual
Change-Id: I227ed1b468f5b84304d92faeee27643d4ec24fbd
(cherry picked from commit e6c742033e60e474040dedcf29b8eba974f94692)

nfc/libnfc-nci.conf

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).