summaryrefslogtreecommitdiffstats
path: root/jni
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 3a8948a0 to jb-dev-plus-aospJean-Baptiste Queru2012-05-012-6/+9
|\
| * NFC JNI: do not log the aid of the transactionChih-Wei Huang2012-03-022-6/+9
* | Fix to avoid a semaphore issue during the SE opendanieltomas2012-04-201-4/+25
* | Added shared prefs for SE wired modeSunil Jogi2012-04-202-4/+4
* | Added delay before NFC system recoverySunil Jogi2012-04-202-0/+2
* | Add support for making Mifare Classic readonly.Martijn Coenen2012-04-051-4/+8
* | 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-022-162/+86
* | 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-302-2/+13
* | Fix advertised well-known services.Martijn Coenen2012-01-271-1/+3
* | LLCP 1.1 support.Martijn Coenen2012-01-272-28/+51
* | LLCP echo server implementation.Martijn Coenen2012-01-201-4/+0
* | Bring LLCP connectionless sockets back to life.Martijn Coenen2012-01-131-2/+2
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-069-158/+158
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-052-17/+17
* | 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-036-51/+51
* | Merge "Always search for p2p target in discovery list."Martijn Coenen2011-12-151-29/+37
|\ \
| * | Always search for p2p target in discovery list.Martijn Coenen2011-12-151-29/+37
* | | Nfc: s/NFC JNI/NFCJNI/ in jni log tag.mike wakerly2011-12-141-1/+1
|/ /
* | LOG -> ALOGNick Pelly2011-12-121-1/+1
* | 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 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies."...Martijn Coenen2011-11-281-64/+38
|\ \ | |/
| * Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1Martijn Coenen2011-11-281-64/+38
| |\
| | * Fix NdefFormatable not showing up for NfcA technologies.Martijn Coenen2011-11-281-64/+38
* | | 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-042-119/+30
* 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
* | 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
|\ \ \ | |/ / |/| |
generated by cgit v1.1 at 2024-12-25 16:06:03 +0000