summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Minor tweaks.Jeff Hamilton2011-03-122-2/+1
* | | am 88234985: am 354aeee4: Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-141-1/+1
|\ \ \ | |/ /
| * | am 354aeee4: Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
| |\ \ | | |/
| | * Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
* | | am 66973b64: am 649229da: am 4f3ef022: Support formatting / makeReadOnly() of...Martijn Coenen2011-02-2410-52/+958
|\ \ \
| * \ \ am 649229da: am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2410-52/+958
| |\ \ \ | | |/ /
| | * | am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2410-52/+958
| | |\ \ | | | |/
| | | * Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2510-52/+958
* | | | am 39850fca: am bb2e41f0: am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
|\ \ \ \ | |/ / /
| * | | am bb2e41f0: am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
| |\ \ \ | | |/ /
| | * | am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
| | |\ \ | | | |/
| | | * Added support for NDEF on ICODE.Martijn Coenen2011-02-256-8/+2016
* | | | am 40e437b3: am a16a757c: am 29e144eb: Fix to prevent accidental stopping of ...Jan Brands2011-02-221-0/+5
|\ \ \ \ | |/ / /
| * | | am a16a757c: am 29e144eb: Fix to prevent accidental stopping of timers.Jan Brands2011-02-221-0/+5
| |\ \ \ | | |/ /
| | * | am 29e144eb: Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
| | |\ \ | | | |/
| | | * Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
* | | | am 7923b4b3: am 32395623: am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST resp...Martijn Coenen2011-02-221-2/+9
|\ \ \ \ | |/ / /
| * | | am 32395623: am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST responses from li...Martijn Coenen2011-02-221-2/+9
| |\ \ \ | | |/ /
| | * | am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.Martijn Coenen2011-02-181-2/+9
| | |\ \ | | | |/
| | | * Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.Martijn Coenen2011-02-181-2/+9
* | | | am e3228db8: am 7f475e47: am 18516f4e: Disable CardEmulation phase when we tr...daniel_tomas2011-02-161-0/+1
|\ \ \ \ | |/ / /
| * | | am 7f475e47: am 18516f4e: Disable CardEmulation phase when we try to access t...daniel_tomas2011-02-161-0/+1
| |\ \ \ | | |/ /
| | * | am 18516f4e: Disable CardEmulation phase when we try to access the Secure Ele...daniel_tomas2011-02-161-0/+1
| | |\ \ | | | |/
| | | * Disable CardEmulation phase when we try to access the Secure Element in Wired...daniel_tomas2011-02-161-0/+1
* | | | am 931707ba: am cd590604: am 64b2569e: Patch to support set mode during the S...daniel_tomas2011-02-161-2/+10
|\ \ \ \ | |/ / /
| * | | am cd590604: am 64b2569e: Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
| |\ \ \ | | |/ /
| | * | am 64b2569e: Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
| | |\ \ | | | |/
| | | * Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
* | | | am e7ca33f1: Merge remote branch \'goog/gingerbread-plus-aosp\' into honeycom...The Android Automerger2011-01-310-0/+0
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'goog/gingerbread-plus-aosp' into honeycomb-plus-aospThe Android Automerger2011-01-310-0/+0
| |\ \ \ | | |/ /
| | * | am 442bead4: Fixed issue with max size NDEF message on T2TJan2011-01-251-1/+4
| | |\ \ | | | |/
* | | | Merge honeycomb-plus-aosp to masterNick Pelly2011-01-31150-0/+110170
|\ \ \ \ | |/ / /
| * | | Reconcile gingerbread-plus-aosp into honeycomb-plus-aosp.Nick Pelly2011-01-311-1/+4
| * | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ \ \
| | * \ \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-30150-0/+110166
| | |\ \ \ | |/ / / / |/| | | |
| | * | | am 442bead4: Fixed issue with max size NDEF message on T2TJan2011-01-291-1/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixed issue with max size NDEF message on T2TJan2011-01-251-1/+4
| | * | | am 75d1d112: Support for using 3-byte length in NDEF TLV on Type 2 Tag.Martijn Coenen2011-01-271-14/+85
| | |\ \ \ | | | |/ /
| | * | | am 32dc2a34: Change the default IsoDep timeout to 300ms.Martijn Coenen2011-01-271-1/+1
| | |\ \ \
| | * \ \ \ am 28235f8b: Erase callback when function returns immediately.Arnaud Ferir2011-01-271-6/+47
| | |\ \ \ \
| | * \ \ \ \ am 407d793f: Fixed LLCP send callback triggering.Arnaud Ferir2011-01-272-8/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ am 42fd1ffc: Fixed erroneous LLCP frame on socket closure.Sylvain Fonteneau2011-01-272-13/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 8608ad93: Fixed LLCP receive window checkings.Sylvain Fonteneau2011-01-272-6/+9
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am a3af9c90: Removed callback in case of immediate end of operation.Arnaud Ferir2011-01-272-143/+72
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am f546a14a: Do not call LLCP socket listen callback on abort.Arnaud Ferir2011-01-271-6/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 44835562: Fixed NULL pointer error when trying to send LLCP REJECT frame.Arnaud Ferir2011-01-271-2/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 99e7261d: Fixed parameters checking in LLCP.Arnaud Ferir2011-01-272-2/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am d9d57394: Fixed some build warnings.Arnaud Ferir2011-01-271-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 40cdab11: Fixed memory handling in LLCP link layer.Arnaud Ferir2011-01-271-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 76270e7c: Allow LLCP socket creation before link establishment.Arnaud Ferir2011-01-274-80/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \