summaryrefslogtreecommitdiffstats
path: root/jni/com_android_nfc_NativeNfcManager.cpp
Commit message (Expand)AuthorAgeFilesLines
* on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is...doug yeager2012-10-031-48/+50
* card emulation patch port to JBdoug yeager2012-08-281-133/+901
* Added shared prefs for SE wired modeSunil Jogi2012-04-201-2/+2
* Added delay before NFC system recoverySunil Jogi2012-04-201-0/+1
* Remote debug logging info.Nick Pelly2012-04-031-1/+1
* Fix locking around download.Martijn Coenen2012-03-211-8/+14
* Support for setting p2p modes from javaland and some cleanup.Martijn Coenen2012-03-021-162/+82
* am 962460d1: am cd7cbe30: Merge "Remove a warning of mismatch arguments"Jean-Baptiste Queru2012-02-151-1/+1
|\
| * Remove a warning of mismatch argumentsChih-Wei Huang2012-02-141-1/+1
* | Use a buffer in connectionless sockets.Martijn Coenen2012-01-301-1/+12
* | Fix advertised well-known services.Martijn Coenen2012-01-271-1/+3
* | LLCP 1.1 support.Martijn Coenen2012-01-271-27/+47
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-061-59/+59
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-051-14/+14
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-4/+4
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-33/+33
* | Always search for p2p target in discovery list.Martijn Coenen2011-12-151-29/+37
* | am 985dcef8: Fix Beam&Tag failures after opening NFC-EE.Nick Pelly2011-12-071-22/+23
|\ \ | |/
| * Fix Beam&Tag failures after opening NFC-EE.Nick Pelly2011-12-071-22/+23
* | am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC ini...Nick Pelly2011-11-171-62/+69
|\ \ | |/
| * Set up DISCOVERY and SE notification callbacks at NFC init.Nick Pelly2011-11-161-62/+69
* | Allow EEPROM settings override using properties.Martijn Coenen2011-11-111-3/+20
|/
* Get EEPROM settings from NFC HAL.Martijn Coenen2011-11-041-117/+27
* EEPROM values for NFC FW 109.11Martijn Coenen2011-10-251-3/+8
* Write NFC EEPROM setting for lower-power poll measurements to default.Martijn Coenen2011-10-251-43/+44
* NFC: Enable guard host timeout.Martijn Coenen2011-10-211-3/+18
* NFC: enable low-power RF polling feature.Martijn Coenen2011-10-111-2/+2
* 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
* | 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
|/
* Merge 3d644e80Jean-Baptiste Queru2011-07-261-2/+19
|\
| * Prevent SE from being opened while target is in field.Daniel Tomas2011-07-251-2/+19
* | 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
* | Relocate the libnfc-nxp Java bridge sources.Jeff Hamilton2011-06-131-12/+12
* | Support for setting the NfcA transceive timeout (NFC Service).Martijn Coenen2011-06-131-32/+65
* | Moar NfcService cleanup.Nick Pelly2011-06-101-256/+137