platform_packages_apps_Nfc/nci, branch master Unnamed repository; edit this file 'description' to name the repository. Refine setNfcSecure 2021-10-12T10:00:17+00:00 George Chang georgekgchang@google.com 2021-10-06T15:45:37+00:00 7b43dc7547d337487c15cb71a4911ac08a0729aa Remove duplicate routing calculation. Fix crash issue when setNfcSecure was called at NFC off state. Bug: 199804867 Test: atest NfcNciInstrumentationTests Change-Id: Ic7f0c088afa95c9bac84a5836d51671e8853dd77 
Remove duplicate routing calculation.
Fix crash issue when setNfcSecure was called at NFC off state.

Bug: 199804867
Test: atest NfcNciInstrumentationTests
Change-Id: Ic7f0c088afa95c9bac84a5836d51671e8853dd77
Merge "Unset reader mode when nfc is turned off" am: 1706779148 am: b140ecf12a 2021-07-19T17:44:43+00:00 Treehugger Robot treehugger-gerrit@google.com 2021-07-19T17:44:43+00:00 2849ea2f8b2e11d2d56c308777bb64e92a207557 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1766029 Change-Id: I7008f835c7dfa719148296fffe0d08c75b4c85ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1766029

Change-Id: I7008f835c7dfa719148296fffe0d08c75b4c85ee
Unset reader mode when nfc is turned off 2021-07-15T09:47:11+00:00 Maoliang Tang tangmaoliang@xiaomi.com 2021-07-15T08:02:04+00:00 911fe8d5d9626cc394e92c1bf0e58bfac812a9ac If nfc is turned off during reader mode, then turning on it again the discovery params is abnormal and fail to read card Let's unset the reader mode to aviod this issue bug: 193753488 Signed-off-by: Maoliang Tang <tangmaoliang@xiaomi.com> Change-Id: Iafac8ad04d3b1960fca725180cc0a0232e314872 
If nfc is turned off during reader mode, then turning on it again
the discovery params is abnormal and fail to read card
Let's unset the reader mode to aviod this issue

bug: 193753488

Signed-off-by: Maoliang Tang <tangmaoliang@xiaomi.com>
Change-Id: Iafac8ad04d3b1960fca725180cc0a0232e314872
Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 2021-07-12T18:08:28+00:00 Bill Yi byi@google.com 2021-07-12T18:08:28+00:00 ad30dfafa0d45377882f748f484b16ae185b6c59 Merged-In: I37aab0de97d19d9256ea54cfe9456a9d4011ca06 Merged-In: Iacb12eed1cfd3d24132927cf50ca9f1ed6d10b25 Merged-In: Iacb12eed1cfd3d24132927cf50ca9f1ed6d10b25 Change-Id: I2a0b9fac972112e39d36d67719e91e68fcc75488 
Merged-In: I37aab0de97d19d9256ea54cfe9456a9d4011ca06
Merged-In: Iacb12eed1cfd3d24132927cf50ca9f1ed6d10b25
Merged-In: Iacb12eed1cfd3d24132927cf50ca9f1ed6d10b25
Change-Id: I2a0b9fac972112e39d36d67719e91e68fcc75488
Merge "Dynamic enable or disable nfc stack log" am: d7a6177e17 am: 8409e67cb9 2021-07-06T08:52:25+00:00 Treehugger Robot treehugger-gerrit@google.com 2021-07-06T08:52:25+00:00 49146959ae3f596f06c24d908a61c6b6fa90b61a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1733514 Change-Id: I953d856f237771b61ce7ece0ee3ef40ecc3ddbe7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1733514

Change-Id: I953d856f237771b61ce7ece0ee3ef40ecc3ddbe7
Dynamic enable or disable nfc stack log 2021-06-11T07:05:04+00:00 Jack Yu jackcwyu@google.com 2021-06-10T16:35:45+00:00 a97fe83eee53daaffc80a4c496385a118aee9893 In addition to config file setting, persist.nfc.debug_enabled can also be used to enable nfc stack log. Bug: 187083201 Test: set/clear property and check nfc log Change-Id: I13ed1399af75bb3c168842fbe795f3e1488d3c2c 
In addition to config file setting, persist.nfc.debug_enabled can also
be used to enable nfc stack log.

Bug: 187083201
Test: set/clear property and check nfc log
Change-Id: I13ed1399af75bb3c168842fbe795f3e1488d3c2c
Potential out of bound in phNciNfc_RecvMfResp 2021-05-20T00:01:17+00:00 Alisher Alikhodjaev alisher@google.com 2021-05-04T22:35:51+00:00 61750f1181ace3ca390489599e36f0e3b725afb0 Bug: 181346550 Test: build ok Change-Id: I2714d022724a3caf3abe077fb9806df3b25f7142 (cherry picked from commit c39c851616f674edb8d9fa98010768eef3ba1913) 
Bug: 181346550
Test: build ok
Change-Id: I2714d022724a3caf3abe077fb9806df3b25f7142
(cherry picked from commit c39c851616f674edb8d9fa98010768eef3ba1913)
Merge "Potential out of bound in phNciNfc_RecvMfResp" into pi-dev am: 7e1d251ed8 am: fb019fa804 am: 07b448ee09 am: 44df0d8558 am: b2d2820425 2021-05-13T05:08:56+00:00 Alisher Alikhodjaev alisher@google.com 2021-05-13T05:08:56+00:00 6fa40e88122848e9c790ea9ba59139263911057d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886 Change-Id: I7a38a0efbbf54abd8a6c734bd58c779de3acb863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886

Change-Id: I7a38a0efbbf54abd8a6c734bd58c779de3acb863
Merge "Potential out of bound in phNciNfc_RecvMfResp" into pi-dev am: 7e1d251ed8 am: fb019fa804 am: 07b448ee09 2021-05-13T04:31:11+00:00 Alisher Alikhodjaev alisher@google.com 2021-05-13T04:31:11+00:00 44df0d855886287cd3fa4a79c39e90bc4629573b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886 Change-Id: I234eaf6e3cc0b969022e41a8df04e52311dc01b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886

Change-Id: I234eaf6e3cc0b969022e41a8df04e52311dc01b7
Merge "Potential out of bound in phNciNfc_RecvMfResp" into pi-dev am: 7e1d251ed8 am: fb019fa804 2021-05-13T03:29:16+00:00 Alisher Alikhodjaev alisher@google.com 2021-05-13T03:29:16+00:00 07b448ee096de8eb8ecf4e04d742382a0bf239e3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886 Change-Id: Idedaa1152ec272f574801a61d430c4f020bc765e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/14430886

Change-Id: Idedaa1152ec272f574801a61d430c4f020bc765e