summaryrefslogtreecommitdiffstats
path: root/jni
Commit message (Expand)AuthorAgeFilesLines
* Manually port d77e05f7 from gingerbread:Jeff Hamilton2011-09-141-49/+202
* Merge "EEPROM setting for configuring NfcF polling, set RC=0."Martijn Coenen2011-09-011-2/+4
|\
| * EEPROM setting for configuring NfcF polling, set RC=0.Martijn Coenen2011-08-081-2/+4
* | Fix to support enable/disable Secure Element through event mechanismSunil Jogi2011-08-241-3/+3
* | Fix GB<->ICS sharing.Martijn Coenen2011-08-191-1/+1
* | Revert "Fix to support enable/disable Secure Element through event mechanism"Nick Pelly2011-08-181-5/+26
* | Fix to support enable/disable Secure Element through event mechanismDaniel Tomas2011-08-161-26/+5
* | Fix memory corruption.Martijn Coenen2011-08-101-2/+10
* | Fix NfcExecutionEnvironment.transceive() failures.Nick Pelly2011-08-091-2/+17
|/
* Merge "resolved conflicts for merge of 5057a591 to master"Nick Pelly2011-07-261-29/+34
|\
| * resolved conflicts for merge of 5057a591 to masterNick Pelly2011-07-261-29/+34
| |\
| | * Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-251-29/+34
* | | Merge "Improve DESFire check to determine NdefFormatable."Martijn Coenen2011-07-261-6/+19
|\ \ \ | |/ / |/| |
| * | Improve DESFire check to determine NdefFormatable.Martijn Coenen2011-07-261-6/+19
* | | Merge 3d644e80Jean-Baptiste Queru2011-07-264-3/+38
|\ \ \ | | |/ | |/|
| * | Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
* | | am e1e26c9d: am 7aedb9c2: Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-191-1/+4
* | Support for getTimeout() (NFC service).Martijn Coenen2011-07-201-11/+57
* | resolved conflicts for merge of 399a21b8 to masterKenny Root2011-07-151-1/+1
|\ \ | |/
| * Do not write to EEPROM when turning screen on/off.Nick Pelly2011-07-121-1/+1
* | resolved conflicts for merge of b5165e13 to masterNick Pelly2011-06-281-10/+75
|\ \ | |/
| * Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-271-10/+75
* | Revert "Temporarily disable FW update for first cut of Nexus Prime bringup."Nick Pelly2011-06-221-3/+0
* | resolved conflicts for merge of 8bda4f3e to masterNick Pelly2011-06-151-0/+8
|\ \ | |/
| * Fix NFC service wake-lock, again.Nick Pelly2011-06-121-0/+9
* | Temporarily disable FW update for first cut of Nexus Prime bringup.Nick Pelly2011-06-151-0/+3
* | Fixes from code review.Jeff Hamilton2011-06-142-20/+5
* | Relocate the libnfc-nxp Java bridge sources.Jeff Hamilton2011-06-137-20/+20
* | Support for setting the NfcA transceive timeout (NFC Service).Martijn Coenen2011-06-131-32/+65
* | Moar NfcService cleanup.Nick Pelly2011-06-102-256/+139
* | Merge "Added support for rediscovering a Tag."Martijn Coenen2011-06-092-16/+7
|\ \
| * | Added support for rediscovering a Tag.Martijn Coenen2011-06-082-16/+7
* | | am b7d77aae: am c93ab994: Patch to add a recovery mechanism in case of a down...daniel_tomas2011-06-081-33/+70
|\ \ \ | | |/ | |/|
| * | Patch to add a recovery mechanism in case of a download failuredaniel_tomas2011-06-021-33/+70
* | | Implement Felica timeout handling (NFC service).Martijn Coenen2011-06-081-3/+27
| |/ |/|
* | Don't manually add NfcA technology to tags.Martijn Coenen2011-06-061-6/+0
* | am 603064f6: am 662d6985: Merge "Another attempt at fixing JNI local referenc...Jeff Hamilton2011-06-022-18/+31
|\ \ | |/
| * Merge "Another attempt at fixing JNI local reference leaks." into gingerbreadJeff Hamilton2011-05-242-18/+31
| |\
| | * Another attempt at fixing JNI local reference leaks.Jeff Hamilton2011-05-212-18/+31
* | | am 4f60f561: am 30f99b9a: Patch to set the ATQA of the P2P NFC Target 106 pas...Daniel Tomas2011-06-021-1/+5
|\ \ \ | |/ /
| * | Patch to set the ATQA of the P2P NFC Target 106 passive to 0x00 0x02Daniel Tomas2011-05-231-1/+5
* | | am 8557ff70: am a60e8301: Change default P2P initiator mode to phNfc_eP2P_ALL...Nick Pelly2011-06-021-2/+26
|\ \ \ | |/ /
| * | Change default P2P initiator mode to phNfc_eP2P_ALL (all passive and 424A).Nick Pelly2011-05-231-2/+26
| |/
* | am df118e14: am 6344b654: Add Revmike wakerly2011-05-121-1/+2
|\ \ | |/
| * Add Revmike wakerly2011-05-121-1/+2
* | am 1a934b77: am 543b1768: Merge "Better logging on SE open failure." into gin...Jeff Hamilton2011-04-291-1/+2
|\ \ | |/
| * Merge "Better logging on SE open failure." into gingerbreadJeff Hamilton2011-04-281-1/+2
| |\
| | * Better logging on SE open failure.Jeff Hamilton2011-04-201-1/+2
* | | am 60312045: am a8d8c1fa: Avoid reference table overflows when dealing with s...Jeff Hamilton2011-04-291-49/+27
|\ \ \ | |/ /