summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | am 1ec4ace9: Call the LLCP send callback in error cases.Arnaud Ferir2011-01-272-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2cabc1d1: Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2TJan Brands2011-01-271-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a6243755: Implement makeReadOnly() for dynamic T1T/T2T.Martijn Coenen2011-01-279-46/+1516
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 72854a2c: Implement IsoDep timeout handling (libNFC).Martijn Coenen2011-01-274-2/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 434eb439: Event field ON/OFF management added in the libnfcdaniel_tomas2011-01-262-10/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78f4485d: Fix bugs related to SE+P2P co-exisitance.Nick Pelly2011-01-261-2/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'goog/honeycomb-merge' into honeycomb-mergeThe Android Automerger2011-01-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge 'goog/honeycomb-plus-aosp' into 'goog/gingerbread-plus-aosp'Nick Pelly2011-01-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge commit '7b6b6a2c' into honeycomb-plus-aospshared_user android-merger-prebuild2011-01-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge libnfc_ndef from gingerbread.Nick Pelly2010-10-166-0/+3022
| * | | | | | | | | | | | | | | | | | | | | | am 75d1d112: Support for using 3-byte length in NDEF TLV on Type 2 Tag.Martijn Coenen2011-01-201-14/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Support for using 3-byte length in NDEF TLV on Type 2 Tag.Martijn Coenen2011-01-201-14/+85
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 32dc2a34: Change the default IsoDep timeout to 300ms.Martijn Coenen2011-01-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Change the default IsoDep timeout to 300ms.Martijn Coenen2011-01-181-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 28235f8b: Erase callback when function returns immediately.Arnaud Ferir2011-01-181-6/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Erase callback when function returns immediately.Arnaud Ferir2011-01-181-6/+47
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 407d793f: Fixed LLCP send callback triggering.Arnaud Ferir2011-01-182-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Fixed LLCP send callback triggering.Arnaud Ferir2011-01-182-8/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 42fd1ffc: Fixed erroneous LLCP frame on socket closure.Sylvain Fonteneau2011-01-182-13/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Fixed erroneous LLCP frame on socket closure.Sylvain Fonteneau2011-01-182-13/+11
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 8608ad93: Fixed LLCP receive window checkings.Sylvain Fonteneau2011-01-182-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Fixed LLCP receive window checkings.Sylvain Fonteneau2011-01-182-6/+9
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am a3af9c90: Removed callback in case of immediate end of operation.Arnaud Ferir2011-01-182-143/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Removed callback in case of immediate end of operation.Arnaud Ferir2011-01-182-143/+72
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am f546a14a: Do not call LLCP socket listen callback on abort.Arnaud Ferir2011-01-181-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Do not call LLCP socket listen callback on abort.Arnaud Ferir2011-01-181-6/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | am 44835562: Fixed NULL pointer error when trying to send LLCP REJECT frame.Arnaud Ferir2011-01-181-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Fixed NULL pointer error when trying to send LLCP REJECT frame.Arnaud Ferir2011-01-181-2/+5
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | am 99e7261d: Fixed parameters checking in LLCP.Arnaud Ferir2011-01-182-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fixed parameters checking in LLCP.Arnaud Ferir2011-01-182-2/+11
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | am d9d57394: Fixed some build warnings.Arnaud Ferir2011-01-181-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fixed some build warnings.Arnaud Ferir2011-01-181-2/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | am 40cdab11: Fixed memory handling in LLCP link layer.Arnaud Ferir2011-01-181-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fixed memory handling in LLCP link layer.Arnaud Ferir2011-01-181-1/+9
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | am 76270e7c: Allow LLCP socket creation before link establishment.Arnaud Ferir2011-01-184-80/+201
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Allow LLCP socket creation before link establishment.Arnaud Ferir2011-01-184-80/+201
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | am 1ec4ace9: Call the LLCP send callback in error cases.Arnaud Ferir2011-01-182-0/+26
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Call the LLCP send callback in error cases.Arnaud Ferir2011-01-182-0/+26
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | am 2cabc1d1: Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2TJan Brands2011-01-181-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2TJan Brands2011-01-181-4/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | am a6243755: Implement makeReadOnly() for dynamic T1T/T2T.Martijn Coenen2011-01-189-46/+1516
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Implement makeReadOnly() for dynamic T1T/T2T.Martijn Coenen2011-01-189-46/+1516
| | | |_|_|_|/ | | |/| | | |
| * | | | | | am 72854a2c: Implement IsoDep timeout handling (libNFC).Martijn Coenen2011-01-184-2/+29
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Implement IsoDep timeout handling (libNFC).Martijn Coenen2011-01-184-2/+29
| | | |_|_|/ | | |/| | |
| * | | | | am 434eb439: Event field ON/OFF management added in the libnfcdaniel_tomas2011-01-122-10/+32
| |\ \ \ \ \ | | |/ / / /
| | * | | | Event field ON/OFF management added in the libnfcdaniel_tomas2011-01-122-10/+32
| | | |_|/ | | |/| |
| * | | | am 78f4485d: Fix bugs related to SE+P2P co-exisitance.Nick Pelly2011-01-111-2/+17
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Fix bugs related to SE+P2P co-exisitance.Nick Pelly2011-01-111-2/+17
| | |/
| * | am 32575757: Libnfc updated to just notify the JNI when a transaction event i...daniel_tomas2011-01-052-2/+2
| |\ \ | | |/
| | * Libnfc updated to just notify the JNI when a transaction event is detecteddaniel_tomas2011-01-052-2/+2