Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | am 1ec4ace9: Call the LLCP send callback in error cases. | Arnaud Ferir | 2011-01-27 | 2 | -0/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2cabc1d1: Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2T | Jan Brands | 2011-01-27 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a6243755: Implement makeReadOnly() for dynamic T1T/T2T. | Martijn Coenen | 2011-01-27 | 9 | -46/+1516 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 72854a2c: Implement IsoDep timeout handling (libNFC). | Martijn Coenen | 2011-01-27 | 4 | -2/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 434eb439: Event field ON/OFF management added in the libnfc | daniel_tomas | 2011-01-26 | 2 | -10/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 78f4485d: Fix bugs related to SE+P2P co-exisitance. | Nick Pelly | 2011-01-26 | 1 | -2/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'goog/honeycomb-merge' into honeycomb-merge | The Android Automerger | 2011-01-26 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge 'goog/honeycomb-plus-aosp' into 'goog/gingerbread-plus-aosp' | Nick Pelly | 2011-01-25 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit '7b6b6a2c' into honeycomb-plus-aosp | shared_user android-merger-prebuild | 2011-01-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge libnfc_ndef from gingerbread. | Nick Pelly | 2010-10-16 | 6 | -0/+3022 | |
| * | | | | | | | | | | | | | | | | | | | | | | am 75d1d112: Support for using 3-byte length in NDEF TLV on Type 2 Tag. | Martijn Coenen | 2011-01-20 | 1 | -14/+85 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Support for using 3-byte length in NDEF TLV on Type 2 Tag. | Martijn Coenen | 2011-01-20 | 1 | -14/+85 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 32dc2a34: Change the default IsoDep timeout to 300ms. | Martijn Coenen | 2011-01-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Change the default IsoDep timeout to 300ms. | Martijn Coenen | 2011-01-18 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 28235f8b: Erase callback when function returns immediately. | Arnaud Ferir | 2011-01-18 | 1 | -6/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Erase callback when function returns immediately. | Arnaud Ferir | 2011-01-18 | 1 | -6/+47 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am 407d793f: Fixed LLCP send callback triggering. | Arnaud Ferir | 2011-01-18 | 2 | -8/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Fixed LLCP send callback triggering. | Arnaud Ferir | 2011-01-18 | 2 | -8/+5 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | am 42fd1ffc: Fixed erroneous LLCP frame on socket closure. | Sylvain Fonteneau | 2011-01-18 | 2 | -13/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Fixed erroneous LLCP frame on socket closure. | Sylvain Fonteneau | 2011-01-18 | 2 | -13/+11 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | am 8608ad93: Fixed LLCP receive window checkings. | Sylvain Fonteneau | 2011-01-18 | 2 | -6/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Fixed LLCP receive window checkings. | Sylvain Fonteneau | 2011-01-18 | 2 | -6/+9 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | am a3af9c90: Removed callback in case of immediate end of operation. | Arnaud Ferir | 2011-01-18 | 2 | -143/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Removed callback in case of immediate end of operation. | Arnaud Ferir | 2011-01-18 | 2 | -143/+72 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am f546a14a: Do not call LLCP socket listen callback on abort. | Arnaud Ferir | 2011-01-18 | 1 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Do not call LLCP socket listen callback on abort. | Arnaud Ferir | 2011-01-18 | 1 | -6/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am 44835562: Fixed NULL pointer error when trying to send LLCP REJECT frame. | Arnaud Ferir | 2011-01-18 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Fixed NULL pointer error when trying to send LLCP REJECT frame. | Arnaud Ferir | 2011-01-18 | 1 | -2/+5 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | am 99e7261d: Fixed parameters checking in LLCP. | Arnaud Ferir | 2011-01-18 | 2 | -2/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Fixed parameters checking in LLCP. | Arnaud Ferir | 2011-01-18 | 2 | -2/+11 | |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am d9d57394: Fixed some build warnings. | Arnaud Ferir | 2011-01-18 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Fixed some build warnings. | Arnaud Ferir | 2011-01-18 | 1 | -2/+1 | |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 40cdab11: Fixed memory handling in LLCP link layer. | Arnaud Ferir | 2011-01-18 | 1 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Fixed memory handling in LLCP link layer. | Arnaud Ferir | 2011-01-18 | 1 | -1/+9 | |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | am 76270e7c: Allow LLCP socket creation before link establishment. | Arnaud Ferir | 2011-01-18 | 4 | -80/+201 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Allow LLCP socket creation before link establishment. | Arnaud Ferir | 2011-01-18 | 4 | -80/+201 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | am 1ec4ace9: Call the LLCP send callback in error cases. | Arnaud Ferir | 2011-01-18 | 2 | -0/+26 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Call the LLCP send callback in error cases. | Arnaud Ferir | 2011-01-18 | 2 | -0/+26 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | am 2cabc1d1: Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2T | Jan Brands | 2011-01-18 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Fixed wrong byte order in 3-byte L-format in NDEF TLV on T2T | Jan Brands | 2011-01-18 | 1 | -4/+4 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | am a6243755: Implement makeReadOnly() for dynamic T1T/T2T. | Martijn Coenen | 2011-01-18 | 9 | -46/+1516 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Implement makeReadOnly() for dynamic T1T/T2T. | Martijn Coenen | 2011-01-18 | 9 | -46/+1516 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | am 72854a2c: Implement IsoDep timeout handling (libNFC). | Martijn Coenen | 2011-01-18 | 4 | -2/+29 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Implement IsoDep timeout handling (libNFC). | Martijn Coenen | 2011-01-18 | 4 | -2/+29 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | am 434eb439: Event field ON/OFF management added in the libnfc | daniel_tomas | 2011-01-12 | 2 | -10/+32 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Event field ON/OFF management added in the libnfc | daniel_tomas | 2011-01-12 | 2 | -10/+32 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | am 78f4485d: Fix bugs related to SE+P2P co-exisitance. | Nick Pelly | 2011-01-11 | 1 | -2/+17 | |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | ||||||
| | * | | Fix bugs related to SE+P2P co-exisitance. | Nick Pelly | 2011-01-11 | 1 | -2/+17 | |
| | |/ | ||||||
| * | | am 32575757: Libnfc updated to just notify the JNI when a transaction event i... | daniel_tomas | 2011-01-05 | 2 | -2/+2 | |
| |\ \ | | |/ | ||||||
| | * | Libnfc updated to just notify the JNI when a transaction event is detected | daniel_tomas | 2011-01-05 | 2 | -2/+2 |