summaryrefslogtreecommitdiffstats
path: root/nci
Commit message (Expand)AuthorAgeFilesLines
* Fix HCE can't handle last empty I-block of a chainJizhou Liao2016-06-241-8/+8
* DO NOT MERGE ANYWHERE. Fix all the warnings in packages/apps/Nfc/nci/jni.Aurimas Liutikas2016-02-298-20/+14
* Merge "Fix Mifare Classic semaphore issue" am: ba27f84d73Martijn Coenen2016-01-251-0/+2
|\
| * Merge "Fix Mifare Classic semaphore issue"Martijn Coenen2016-01-251-0/+2
| |\
| | * Fix Mifare Classic semaphore issueJizhou Liao2015-11-061-0/+2
* | | resolve merge conflicts of ab0586a700 to master.Martijn Coenen2016-01-254-60/+427
|\| |
| * | Implementation of HCE for NFC-F.Yoshinobu Ito2016-01-224-60/+427
* | | Implement API for "debouncing" NFC tags.Martijn Coenen2016-01-181-7/+12
|/ /
* / Treat more as a UINT8 like it should be.Martijn Coenen2015-11-242-2/+2
|/
* Use global all-cpp-files-underDan Willemsen2015-09-301-12/+1
* Support Mifare Classic tagJizhou Liao2015-08-1828-44/+15050
* Support Mifare DESFire tag formatJizhou Liao2015-08-043-5/+94
* Merge "Fix conflict vendor proprietary Protocol and Discovery technology defi...Martijn Coenen2015-08-042-240/+215
|\
| * Fix conflict vendor proprietary Protocol and Discovery technology definitionJizhou Liao2015-07-312-240/+215
* | Merge "Fix peer-to-peer server register error if RF discovery is started."Martijn Coenen2015-07-292-0/+29
|\ \
| * | Fix peer-to-peer server register error if RF discovery is started.Jizhou Liao2015-07-282-0/+29
| |/
* / Reset P2P flag in de-initialization.Jizhou Liao2015-07-011-0/+1
|/
* Expose peer LLCP version to apps.Martijn Coenen2015-04-152-0/+9
* am 9d734bdf: Merge "Add missing includes."Elliott Hughes2015-01-295-1/+10
|\
| * Add missing includes.Elliott Hughes2015-01-285-1/+10
* | am 2d1187fa: Merge "Remove hardcoded ICU include paths."Narayan Kamath2015-01-051-1/+0
|\|
| * Remove hardcoded ICU include paths.Narayan Kamath2015-01-051-1/+0
* | am f30e2ed4: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-161-1/+0
|\|
| * Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-161-1/+0
* | am 91cf8245: am e6b10cf6: Fix issue where Beam is disabled in SWAndres Morales2014-12-041-1/+1
|\ \
| * | Fix issue where Beam is disabled in SWAndres Morales2014-12-031-1/+1
* | | am 10e647dd: am 8a80bc7b: Merge "Prevent Beam at the lockscreen and during pr...Andres Morales2014-11-252-7/+17
|\| | | |/ |/|
| * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-192-7/+17
* | Move packages/apps/Nfc to libc++.Dan Albert2014-11-151-1/+0
* | am 269280d2: am f863f79a: Merge "Shutdown EEs when NFC is disabled." into lmp...Martijn Coenen2014-09-243-0/+49
|\|
| * Shutdown EEs when NFC is disabled.Martijn Coenen2014-09-223-0/+49
* | am 894c9fe3: am b5370c06: Merge "Don\'t report tag as NdefFormatable if alrea...Martijn Coenen2014-09-161-0/+1
|\|
| * Don't report tag as NdefFormatable if already NDEF.Martijn Coenen2014-09-161-0/+1
* | am 34e6f0f2: am b3ac715d: Merge "Support for AID prefix registration." into l...Martijn Coenen2014-09-162-1/+25
|\|
| * Merge "Support for AID prefix registration." into lmp-devMartijn Coenen2014-09-162-1/+25
| |\
| | * Support for AID prefix registration.Martijn Coenen2014-09-152-1/+25
* | | am 512698ea: Merge "Remove makefile cruft."Dan Albert2014-09-121-4/+3
|\ \ \ | |/ / |/| |
| * | Remove makefile cruft.Dan Albert2014-09-121-4/+3
* | | Merge "RoutingManager class shall properly handle RF-deactivate event." into ...Martijn Coenen2014-09-121-0/+9
|\ \ \
| * | | RoutingManager class shall properly handle RF-deactivate event.Evan Chu2014-09-101-0/+9
| | |/ | |/|
* / | Reinstate RF field events.Martijn Coenen2014-09-082-0/+31
|/ /
* | Merge "Restrict UICC listen to Type-A only." into lmp-devMartijn Coenen2014-08-151-20/+19
|\ \
| * | Restrict UICC listen to Type-A only.Martijn Coenen2014-08-141-20/+19
* | | Merge "Prevent deadlock during NDEF-detection." into lmp-devMartijn Coenen2014-08-151-6/+0
|\ \ \
| * | | Prevent deadlock during NDEF-detection.Evan Chu2014-08-141-6/+0
* | | | Merge "Use SE tech parameters when available." into lmp-devMartijn Coenen2014-08-142-22/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Use SE tech parameters when available.Martijn Coenen2014-08-132-22/+36
| |/ /
* / / Fix deadlock.Martijn Coenen2014-08-111-19/+21
|/ /
* | Support for configuring SE listen technologies.Martijn Coenen2014-07-254-4/+76
* | am a4464d73: am f62a9a00: Merge "Switch Nfc to the new icu."Elliott Hughes2014-07-101-2/+2
|\|