diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-19 03:41:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-19 03:41:19 +0000 |
| commit | 2e7ec470f7dedd79bbdff73ecbdbc455bd48add5 (patch) | |
| tree | 08b21f535c3ab0791a9d6468af56866bebfaef40 | |
| parent | ea787d8c9014024a008a32f84c906d20dda59981 (diff) | |
| parent | f226bb1f86ec75b098c67cf27f2cb096161a1ee2 (diff) | |
| download | common-android10-s3-release.tar.gz | |
Merge cherrypicks of [8689551, 8689566, 8689567, 8690716] into qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: If76d9d6d021e63f0d45d1d0d7f444b830a8ca76a
| -rw-r--r-- | nfc/libnfc-nci.conf | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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=0xEF +POLLING_TECH_MASK=0x2F ############################################################################### # Force P2P to only listen for the following technology(s). @@ -48,7 +48,7 @@ SCREEN_OFF_POWER_STATE=1 # 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). |