summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
|\ \ \ | |/ / | | | | | | | | | * commit '882349859efd9537d8dca8d5e5bf6a88c4fc42ff': Fix a compilation bug with PHDBG_TRACES enabled.
| * | am 354aeee4: Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '354aeee4f256f2bfb013a1f11324b7f54386fedd': Fix a compilation bug with PHDBG_TRACES enabled.
| | * Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
| | | | | | | | | | | | Change-Id: I6f3a96b9b063b66f735ff97c1aa63aaaad0a03b9
* | | am 66973b64: am 649229da: am 4f3ef022: Support formatting / makeReadOnly() ↵Martijn Coenen2011-02-2410-52/+958
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | of NDEF on ICODE. * commit '66973b6478befa02b0f227f7069fe9f22ec4c28f': Support formatting / makeReadOnly() of NDEF on ICODE.
| * \ \ am 649229da: am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2410-52/+958
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '649229da505c1f8564f6dd6f2873a9a96416a7d9': Support formatting / makeReadOnly() of NDEF on ICODE.
| | * | am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2410-52/+958
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5': Support formatting / makeReadOnly() of NDEF on ICODE.
| | | * Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2510-52/+958
| | | | | | | | | | | | | | | | Change-Id: I2a7a185ead5de8f2b165c81dcc8ab8fb46c1ddc0
* | | | am 39850fca: am bb2e41f0: am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '39850fca6051deb349f8b13f4f7e0203834526b3': Added support for NDEF on ICODE.
| * | | am bb2e41f0: am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bb2e41f0d14865792bafbd9a4ff2aa778fde2049': Added support for NDEF on ICODE.
| | * | am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'a6e012a748e70ab203655d4e1c0d0a77b6515fad': Added support for NDEF on ICODE.
| | | * Added support for NDEF on ICODE.Martijn Coenen2011-02-256-8/+2016
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows reading and writing of NDEF messages on ICODE tags. Change-Id: I43b4845c898c2bf268f609a5a81e991460059ff6
* | | | am 40e437b3: am a16a757c: am 29e144eb: Fix to prevent accidental stopping of ↵Jan Brands2011-02-221-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | timers. * commit '40e437b3d6885ba04c356f840db6af18f9e39308': Fix to prevent accidental stopping of timers.
| * | | am a16a757c: am 29e144eb: Fix to prevent accidental stopping of timers.Jan Brands2011-02-221-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'a16a757c0365eb800e5cc675670a3a2d97fd1b8e': Fix to prevent accidental stopping of timers.
| | * | am 29e144eb: Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '29e144ebf81b0f09b3fe4c26b67485ce836909c6': Fix to prevent accidental stopping of timers.
| | | * Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time-out value of 0 is used to indicate minimum value, see e.g. PH_HAL4NFC_RECV_CB_TIMEOUT in phHal4Nfc_P2P.c where it is used with P2P target receive in case data has already been received by the PN544 Change-Id: I9f15f2135ca003b848590fc87265edb39d85bf4c
* | | | am 7923b4b3: am 32395623: am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST ↵Martijn Coenen2011-02-221-2/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | responses from libNFC. * commit '7923b4b3394bd08bdfc866572b1a756eab4f5ce1': Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.
| * | | am 32395623: am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST responses from ↵Martijn Coenen2011-02-221-2/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | libNFC. * commit '323956234e513e9200e2ec2b44dee3a37e937094': Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.
| | * | am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.Martijn Coenen2011-02-181-2/+9
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'a61bf7e2cb6cf80f1deea680613423a477ac4fb8': Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.
| | | * Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.Martijn Coenen2011-02-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During extensive testing we found that some ISO15693 tags do not react to some commands. However, they do send an error code to the PN544 indicating they do not support the command. The PN544 in turn sends one specific error code over the HCI interface. However, libNFC maps that error code always to NFCSTATUS_TARGET_LOST, which in the end maps to the application API reporting a TargetLostException. This fix maps only the timeout return values from the PN544 to NFCSTATUS_TARGET_LOST; all other values are mapped to NFCSTATUS_FAILED, which in turn maps to an IOException at API level. In effect, a timeout is still not the same as a target lost; libNFC does not do any additional internal presence check to make sure the tag is really gone, although it usually is. I'll submit a separate fix on packages/apps/Nfc to take care of this. Change-Id: If64857658d683aff29134f74b42efd99b695e634
* | | | am e3228db8: am 7f475e47: am 18516f4e: Disable CardEmulation phase when we ↵daniel_tomas2011-02-161-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | try to access the Secure Element in Wired Mode. * commit 'e3228db81d536cd548d16b2490ea455ecb6c99d0': Disable CardEmulation phase when we try to access the Secure Element in Wired Mode.
| * | | am 7f475e47: am 18516f4e: Disable CardEmulation phase when we try to access ↵daniel_tomas2011-02-161-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | the Secure Element in Wired Mode. * commit '7f475e47862231e0de830700dd4b56bd3b03e569': Disable CardEmulation phase when we try to access the Secure Element in Wired Mode.
| | * | am 18516f4e: Disable CardEmulation phase when we try to access the Secure ↵daniel_tomas2011-02-161-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Element in Wired Mode. * commit '18516f4e58aad80815fb6efea22d217d39b90c10': Disable CardEmulation phase when we try to access the Secure Element in Wired Mode.
| | | * Disable CardEmulation phase when we try to access the Secure Element in ↵daniel_tomas2011-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wired Mode. This fix permit to detect the Secure Element in Wired Mode, even we are in front of a RF Reader Change-Id: I8f87e043ff24724addd179ce025cf3d038a82a5e
* | | | am 931707ba: am cd590604: am 64b2569e: Patch to support set mode during the ↵daniel_tomas2011-02-161-2/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SE Wired mode * commit '931707baca45d39e18dc074354c7e9eadf155904': Patch to support set mode during the SE Wired mode
| * | | am cd590604: am 64b2569e: Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cd590604cb1b18c999b96fbd4b1a3628718ecc79': Patch to support set mode during the SE Wired mode
| | * | am 64b2569e: Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '64b2569ec9b3f607a41640500387698b9dc91238': Patch to support set mode during the SE Wired mode
| | | * Patch to support set mode during the SE Wired modedaniel_tomas2011-02-161-2/+10
| | | | | | | | | | | | | | | | Change-Id: I57eaa3ccd65b89510e198f7ebf24f7266c4dad2e
* | | | am e7ca33f1: Merge remote branch \'goog/gingerbread-plus-aosp\' into ↵The Android Automerger2011-01-310-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | honeycomb-plus-aosp * commit 'e7ca33f1bb5ac1ec987934197f46ca9593645aab':
| * | | 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
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '442bead483a0a6fd9254fc83a5ea76474c6dbbe7': Fixed issue with max size NDEF message on T2T
* | | | Merge honeycomb-plus-aosp to masterNick Pelly2011-01-31150-0/+110170
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I69943db31637db7fddbc6c60d76c62a40f17cda8
| * | | Reconcile gingerbread-plus-aosp into honeycomb-plus-aosp.Nick Pelly2011-01-311-1/+4
| | | | | | | | | | | | | | | | Change-Id: I28c9a0c89bd9a4691b077e13c5a8d572c23f4a7e
| * | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I30aba890393142f1c36d3c5ccd8a67ac447a54c9
| | * \ \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-30150-0/+110166
| | |\ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I7c0a4dae65d3ffc9956515f65dc33aa00375e751
| | * | | am 442bead4: Fixed issue with max size NDEF message on T2TJan2011-01-291-1/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '442bead483a0a6fd9254fc83a5ea76474c6dbbe7': Fixed issue with max size NDEF message on T2T
| | | * | Fixed issue with max size NDEF message on T2TJan2011-01-251-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: If6b490d906fcc37960a1120e9344470d68c825f6
| | * | | am 75d1d112: Support for using 3-byte length in NDEF TLV on Type 2 Tag.Martijn Coenen2011-01-271-14/+85
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '75d1d112cfdb7dbdc7d98b0ca59a8eacca9aa08f': Support for using 3-byte length in NDEF TLV on Type 2 Tag.
| | * | | am 32dc2a34: Change the default IsoDep timeout to 300ms.Martijn Coenen2011-01-271-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '32dc2a34ddc103cc5f2e10059b3113876eb391aa': Change the default IsoDep timeout to 300ms.
| | * \ \ \ am 28235f8b: Erase callback when function returns immediately.Arnaud Ferir2011-01-271-6/+47
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28235f8b29ef8cc368dd132080245778cdf704cc': Erase callback when function returns immediately.
| | * \ \ \ \ am 407d793f: Fixed LLCP send callback triggering.Arnaud Ferir2011-01-272-8/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '407d793f3038222dac95651866b99cd064e214eb': Fixed LLCP send callback triggering.
| | * \ \ \ \ \ am 42fd1ffc: Fixed erroneous LLCP frame on socket closure.Sylvain Fonteneau2011-01-272-13/+11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42fd1ffc1f8f87e7faca1724d128dafa70ff3b1e': Fixed erroneous LLCP frame on socket closure.
| | * \ \ \ \ \ \ am 8608ad93: Fixed LLCP receive window checkings.Sylvain Fonteneau2011-01-272-6/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8608ad938da280b895e3bb71435d6fe34c589219': Fixed LLCP receive window checkings.
| | * \ \ \ \ \ \ \ am a3af9c90: Removed callback in case of immediate end of operation.Arnaud Ferir2011-01-272-143/+72
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3af9c908f5c50e2405169015c86a1b667b42490': Removed callback in case of immediate end of operation.
| | * \ \ \ \ \ \ \ \ am f546a14a: Do not call LLCP socket listen callback on abort.Arnaud Ferir2011-01-271-6/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f546a14a4509e1814bfd94fc76cdfa2252dc455c': Do not call LLCP socket listen callback on abort.
| | * \ \ \ \ \ \ \ \ \ am 44835562: Fixed NULL pointer error when trying to send LLCP REJECT frame.Arnaud Ferir2011-01-271-2/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44835562edd67f15196a47631a384afb1d8b8068': Fixed NULL pointer error when trying to send LLCP REJECT frame.
| | * \ \ \ \ \ \ \ \ \ \ am 99e7261d: Fixed parameters checking in LLCP.Arnaud Ferir2011-01-272-2/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99e7261d709ad32e0203dced9f4a386c5f719adf': Fixed parameters checking in LLCP.
| | * \ \ \ \ \ \ \ \ \ \ \ am d9d57394: Fixed some build warnings.Arnaud Ferir2011-01-271-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9d57394761c70786f5058f82e7528bfaf1807a0': Fixed some build warnings.
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 40cdab11: Fixed memory handling in LLCP link layer.Arnaud Ferir2011-01-271-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40cdab11e00d801c1b9acfdcfe53455059c1b557': Fixed memory handling in LLCP link layer.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 76270e7c: Allow LLCP socket creation before link establishment.Arnaud Ferir2011-01-274-80/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76270e7c32ec0c558907430e756712d5b68b417c': Allow LLCP socket creation before link establishment.