diff options
author | Ruchi Kandoi <kandoiruchi@google.com> | 2018-06-26 08:24:52 -0700 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-26 23:44:09 +0000 |
commit | 765faea6ba4b93d62d40bcef7a975d1570c4e4a5 (patch) | |
tree | ddad3658f7b2dc6c1c4208fdb7a56c005e99105f | |
parent | e0ded1621336511fa7db251fa0f9b5bd78d92d7b (diff) | |
download | marlin-android-wear-9.0.0_r12.tar.gz |
Set PRESENCE_CHECK_ALGORITHM to I_BLOCK instead of ISO_DEP_NAKandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r3android-9.0.0_r2android-9.0.0_r10android-9.0.0_r1pie-vts-releasepie-release-2pie-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
ISO_DEP_NAK is supported only on NCI 2.0 and since pn551 is functioning
in NCI 1.0, the config should be set to I_BLOCK.
Test: CtsVerifier-> HCE Tests
Bug: 110247910
Change-Id: I35cec24da450e891bd0d748c38f4d93261aaed2e
(cherry picked from commit 9f0ab139dbc97bfd78c220eb90cc7f9c7f556ea3)
-rw-r--r-- | nfc/libnfc-nxp.marlin.conf | 2 | ||||
-rw-r--r-- | nfc/libnfc-nxp.sailfish.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nfc/libnfc-nxp.marlin.conf b/nfc/libnfc-nxp.marlin.conf index cadeb7b3..0b64d8d9 100644 --- a/nfc/libnfc-nxp.marlin.conf +++ b/nfc/libnfc-nxp.marlin.conf @@ -278,6 +278,6 @@ NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF} # 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block # 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check # command is sent waiting for rsp and ntf. -PRESENCE_CHECK_ALGORITHM=2 +PRESENCE_CHECK_ALGORITHM=1 ############################################################################### diff --git a/nfc/libnfc-nxp.sailfish.conf b/nfc/libnfc-nxp.sailfish.conf index 53ef4079..66071532 100644 --- a/nfc/libnfc-nxp.sailfish.conf +++ b/nfc/libnfc-nxp.sailfish.conf @@ -279,6 +279,6 @@ NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF} # 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block # 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check # command is sent waiting for rsp and ntf. -PRESENCE_CHECK_ALGORITHM=2 +PRESENCE_CHECK_ALGORITHM=1 ############################################################################### |