summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stop "LLC length mis-match" log spamHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Vladislav Koldobskiy2016-05-041-1/+1
* Updated path for seperate vendor partitionstaging/cm-12.0-cafstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0EDaniel Rosenberg2014-06-131-1/+1
* Merge "libnfc-nxp: fix build for 64-bit"Colin Cross2014-03-2510-33/+35
|\
| * libnfc-nxp: fix build for 64-bitColin Cross2014-03-2110-33/+35
|/
* am b4564787: Merge "Remove a dependency on a device-kernel-specific header."Elliott Hughes2013-11-221-2/+1
|\
| * Merge "Remove a dependency on a device-kernel-specific header."Elliott Hughes2013-11-231-2/+1
| |\
| | * Remove a dependency on a device-kernel-specific header.Elliott Hughes2013-11-221-2/+1
| |/
* / Fix crash in reader mode.Martijn Coenen2013-09-132-7/+9
|/
* Return NFCSTATUS_BUSY in case of invalid state transition.Martijn Coenen2013-04-252-2/+9
* Restore SE activated mode in case of failure.Martijn Coenen2013-04-121-0/+3
* Add liblogYing Wang2013-04-091-2/+2
* Make sure LLCP header fields are reset.Martijn Coenen2013-03-062-12/+11
* Fix wrong callback being cleared.Martijn Coenen2013-03-054-9/+9
* Fix some LLCP threading issues.Martijn Coenen2013-03-055-156/+181
* Immediately bounce back SYMM packet when initiator.Martijn Coenen2013-02-281-6/+19
* Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-devMartijn Coenen2012-11-281-1/+13
|\
| * NDEF Type 3 tag reading with padding bytesSunil Jogi2012-11-271-1/+13
* | Increase default IsoDep timeout to 1200ms.Martijn Coenen2012-11-271-1/+1
|/
* am e4d3c945: Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
|\
| * Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
| |\
| | * Add support for target-customized NFC stack configurationSebastian Niciarz2012-08-232-19/+23
* | | am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
|\| |
| * | Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| |\ \
| | * | HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA2012-08-141-0/+1
| | |/
* | | am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
|\| |
| * | Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
| |\ \ | | |/ | |/|
| | * Support of topaz tag NFC Forum version number 1.1Dejan REBRACA2012-08-141-1/+4
| |/
* | phHal4Nfc_ADD: fix memcpy overlapNick Kralevich2012-07-171-5/+8
* | phFriNfc_OvrHal: fix memcpy overlapNick Kralevich2012-07-171-1/+4
* | am b668d06f: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\|
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\
| | * Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | |\
* | | | am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
|\| | |
| * | | am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| |\ \ \
| | * | | Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | |/ /
* | | | am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO N...Martijn Coenen2012-06-120-0/+0
|\| | |
| * | | am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
| |\| |
| | * | Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
* | | | Remove some logs in case of abort().Martijn Coenen2012-06-081-4/+3
|/ / /
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| |\ \ | | |/ | |/|
* | | am ba040759: Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
|\| |
| * | Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
| | |
| \ \
*-. | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \| | | |/ / |/| / | |/
| * merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
|/|
| * merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| |\
| | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | |\
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | |\