aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/NfcService.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'caf/caf/nxpnfc-project/br_android_ncihalx_row_q' into nfc.sys.l...Tapas Dey2019-09-041-26/+29
|\
| * QSSI Alignment.Ganesh Deva2019-08-201-3/+113
| * Support for EMVCo PCD certification Analog test cases.Ganesh Deva2019-08-201-2/+2
| * Redesign to make common code baseGanesh Deva2019-08-201-178/+102
| * Code Clean-UpGanesh Deva2019-08-201-0/+0
| * {Q_AOSP}: Fix Multiple Toast Stack UpGanesh Deva2019-07-121-4/+13
| * {Q_AOSP}: Add SecureNfc state as dump logGanesh Deva2019-07-121-0/+1
| * {Q_AOSP}: Prevent SecureNfc disable if keyguard is lockedGanesh Deva2019-07-121-0/+5
| * {Q_AOSP}: Add StatsLog for SecureNfc stateGanesh Deva2019-07-121-0/+4
| * {Q_AOSP}: Add Nfc statistic dataGanesh Deva2019-07-121-0/+5
| * {Q_AOSP}: Add error toast for tag read failureGanesh Deva2019-07-121-0/+9
* | Merge branch 'caf/caf/nxpnfc-project/br_android_ncihalx_q' into nfc.sys.lnx.1.0Tapas Dey2019-08-221-174/+241
|\ \
| * | Redesign to make common code basenxf241782019-08-141-171/+100
| * | Nfc enable and disable API synchronized.Ayush Raj2019-08-141-0/+28
| * | Added self test API to validate DTE analog testsGanesh Deva2019-08-141-0/+12
| * | Fix Multiple Toast Stack UpAyush Raj2019-08-141-4/+13
| * | Add SecureNfc state as dump logAyush Raj2019-08-141-0/+1
| * | Prevent SecureNfc disable if keyguard is lockedAyush Raj2019-08-141-0/+5
| * | Add StatsLog for SecureNfc stateAyush Raj2019-08-141-0/+4
| * | Add Nfc statistic dataAyush Raj2019-08-141-0/+5
| * | Add error toast for tag read failureAyush Raj2019-08-141-0/+9
| * | T4t NFCEE MW APIs implementationSuhas Suresh2019-08-141-3/+74
| * | Add api's to activate and deactivate eSE contact interfaceSuraj Uday Kotharkar2019-08-141-0/+21
| * | Routing table cmd is going twice if payment application is installedhariprasad.nalacheruvu2019-08-141-1/+1
| * | Fix NFC service die observed when perform FW update while wtx ongoing over SPIhariprasad.nalacheruvu2019-08-141-0/+1
* | | NFC: Merge branch 'caf/caf/nxpnfc-project/br_android_ncihalx_row_q' into nfc....Gaurav Singhal2019-07-081-1/+29
|\ \ \ | | |/ | |/|
| * | check Nfc status before calling commitRouting()Suhas Suresh2019-07-011-2/+1
| * | Nfc enable and disable API synchronized.Ganesh Deva2019-07-011-0/+28
| * | Avoid LMRT update happening twice during Nfc InitSuhas Suresh2019-07-011-0/+1
| * | Cleanup APDU pattern related changesSuhas Suresh2019-07-011-41/+1
| * | SSI Alignment.Ganesh Deva2019-07-011-14/+45
| * | code cleanupSuhas Suresh2019-07-011-12/+0
| * | Field Detect feature ImplementationSuhas Suresh2019-07-011-0/+12
| * | Fix no RF_DISC if NFC service crashed in SCREEN_OFF state.Ganesh Deva2019-07-011-13/+3
| * | Fix Tech-F power state not updated from conf file macro.Ganesh Deva2019-07-011-1/+1
| * | Fix empty AID route power state is wrong in Overflow use case.Ganesh Deva2019-07-011-5/+2
* | | NFC: Merge branch 'caf/caf/nxpnfc-project/br_android_ncihalx_q' into nfc.sys....Gaurav Singhal2019-07-021-89/+56
|\ \ \ | | |/ | |/|
| * | Revert "[artf662124]: Nfc enable and disable API synchronized."Anil Hiranniah2019-06-281-28/+0
| * | Nfc enable and disable API synchronized.Ganesh Deva2019-06-281-0/+28
| * | Field Detect feature Implementationhariprasad nalacheruvu2019-06-281-0/+12
| * | code cleanupSuhas Suresh2019-06-281-12/+0
| * | Cleanup APDU pattern related changesSuhas Suresh2019-06-281-41/+1
| * | artf667547{Q_Beta2}: Fix beam share preference on policy changeGanesh Deva2019-06-281-11/+19
| * | Fix empty AID route power state is wrong in Overflow use case.Ganesh Deva2019-06-281-4/+41
| * | Fix Tech-F power state not updated from conf file macro.Ganesh Deva2019-06-281-1/+1
| * | Fix for synchronized NFCService thread.Ayush Raj2019-06-281-5/+3
| * | Fix for no listen phase when NFC service killed in screen off stateAyush Raj2019-06-281-8/+0
* | | NFC: Merge branch 'caf/caf/nxpnfc-project/br_android_ncihalx_row_q' into nfc....Gaurav Singhal2019-06-251-52/+80
|\ \ \ | | |/ | |/|
| * | QSSI Alignment with q_SN1xx_base_devnxf500512019-05-281-3/+2
| * | QSSI Alignment with q_SN1xx_base_devAnil Hiranniah2019-05-281-1/+1