summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
* | | Properly merge b5165e13 to master.Nick Pelly2011-06-283-3/+24
* | | resolved conflicts for merge of b5165e13 to masterNick Pelly2011-06-282-1/+66
|\ \ \ | |/ /
| * | am 2c37e6a8: Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-282-1/+66
| |\ \ | | |/
| | * Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-272-1/+66
* | | Remove unnecessary param from profile vcard URI.Dave Santoro2011-06-241-1/+0
* | | Properly merge SE reset timeout fix.Nick Pelly2011-06-221-2/+2
* | | resolved conflicts for merge of d15714ce to masterNick Pelly2011-06-221-0/+5
|\ \ \ | |/ /
| * | am 5a8844da: NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
| |\ \ | | |/
| | * NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
* | | Hack to fix broken buildBen Dodson2011-06-221-2/+2
* | | am 10577281: am 85a8366a: Set the transceive timeout to 10s when executeSeRes...Daniel Tomas2011-06-221-0/+4
|\ \ \ | |/ /
| * | am 85a8366a: Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
| |\ \ | | |/
| | * Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
* | | Exchange me profile over NFC using android SNEP service.Martijn Coenen2011-06-223-51/+148
* | | Merge "Close SNEP socket on IOException."Ben Dodson2011-06-201-1/+8
|\ \ \
| * | | Close SNEP socket on IOException.Martijn Coenen2011-06-201-1/+8
* | | | Merge commit '52eadbdd' into nfcJason parks2011-06-201-2/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 84e1e0ad: Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
| |\ \ | | |/
| | * Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
* | | Merge "Close sockets on failure"Ben Dodson2011-06-172-1/+9
|\ \ \
| * | | Close sockets on failureBen Dodson2011-06-172-1/+9
* | | | Play sounds for start, end, and error.Jeff Hamilton2011-06-172-50/+90
* | | | Merge "Updates for SnepServer thread safety"Ben Dodson2011-06-161-6/+36
|\ \ \ \
| * | | | Updates for SnepServer thread safetyBen Dodson2011-06-161-6/+36
* | | | | Merge "automatically share packages of user apps that don't support nfc"Ben Dodson2011-06-162-2/+36
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | automatically share packages of user apps that don't support nfcBen Dodson2011-06-162-2/+36
* | | | Merge "Finer-grained synchronization"Ben Dodson2011-06-162-35/+58
|\ \ \ \ | |/ / /
| * | | Finer-grained synchronizationBen Dodson2011-06-162-35/+58
* | | | resolved conflicts for merge of 8bda4f3e to masterNick Pelly2011-06-152-1/+32
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 2edb3ee5: Fix NFC service wake-lock, again.Nick Pelly2011-06-152-3/+33
| |\ \ | | |/
| | * Fix NFC service wake-lock, again.Nick Pelly2011-06-122-3/+33
* | | Merge snep p2p to masterBen Dodson2011-06-159-186/+1015
* | | First pass at an abstraction of the NFC stack.Jeff Hamilton2011-06-135-278/+502
* | | Relocate the libnfc-nxp Java bridge sources.Jeff Hamilton2011-06-138-20/+17
* | | Support for setting the NfcA transceive timeout (NFC Service).Martijn Coenen2011-06-132-21/+11
* | | Moar NfcService cleanup.Nick Pelly2011-06-106-324/+14
* | | resolved conflicts for merge of 8b3098bd to masterNick Pelly2011-06-091-27/+27
|\ \ \ | |/ /
| * | am dfac80d2: Fix regression in NFC-EE close() cleanup path for dead applicati...Nick Pelly2011-06-071-27/+27
| |\ \ | | |/
| | * Fix regression in NFC-EE close() cleanup path for dead applications.Nick Pelly2011-06-021-27/+27
* | | Merge "Added support for rediscovering a Tag."Martijn Coenen2011-06-092-123/+191
|\ \ \
| * | | Added support for rediscovering a Tag.Martijn Coenen2011-06-082-123/+191
* | | | resolved conflicts for merge of fe817189 to masterNick Pelly2011-06-081-21/+45
|\ \ \ \ | | |/ / | |/| |
| * | | am aa122139: Make sure NFC stack is initialized before attempting SE reset.Nick Pelly2011-06-071-25/+49
| |\ \ \ | | | |/ | | |/|
| | * | Make sure NFC stack is initialized before attempting SE reset.Nick Pelly2011-05-311-25/+49
* | | | Merge "Slay the NfcService beast, part one."Nick Pelly2011-06-082-417/+403
|\ \ \ \
| * | | | Slay the NfcService beast, part one.Nick Pelly2011-06-082-417/+403
| | |_|/ | |/| |
* | | | Implement Felica timeout handling (NFC service).Martijn Coenen2011-06-082-6/+19
|/ / /
* | | am 30f997de: am b8318ada: Merge "Fix a bug with absolute URI processing." int...Jeff Hamilton2011-06-071-2/+2
|\ \ \ | |/ /
| * | am b8318ada: Merge "Fix a bug with absolute URI processing." into gingerbreadJeff Hamilton2011-06-061-2/+2
| |\ \ | | |/