summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| |\ \ | | |/
| | * Merge "Fix a bug with absolute URI processing." into gingerbreadJeff Hamilton2011-05-251-2/+2
| | |\
| | | * Fix a bug with absolute URI processing.Jeff Hamilton2011-05-251-2/+2
* | | | resolved conflicts for merge of f9283b76 to masterNick Pelly2011-06-071-105/+68
|\ \ \ \ | |/ / /
| * | | am d30c5d61: Merge "Use a hardcoded SE reset script." into gingerbreadNick Pelly2011-06-061-105/+68
| |\ \ \ | | |/ /
| | * | Merge "Use a hardcoded SE reset script." into gingerbreadNick Pelly2011-05-251-105/+68
| | |\ \ | | | |/ | | |/|
| | | * Use a hardcoded SE reset script.Nick Pelly2011-05-241-105/+68
* | | | Merge "Throw unsupported exception when connecting to NfcB."Martijn Coenen2011-06-062-83/+5
|\ \ \ \
| * | | | Throw unsupported exception when connecting to NfcB.Martijn Coenen2011-06-062-83/+5
* | | | | am 389c8d8a: am 21ee4b2e: Add support for TNF_EXTERNAL in NDEF_DISCOVERED int...Jeff Hamilton2011-06-061-0/+8
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 21ee4b2e: Add support for TNF_EXTERNAL in NDEF_DISCOVERED intents.Jeff Hamilton2011-06-061-0/+8
| |\ \ \ | | |/ /
| | * | Add support for TNF_EXTERNAL in NDEF_DISCOVERED intents.Jeff Hamilton2011-05-241-0/+8
| | |/
* | | Merge "Enable NFC after the device is unlocked."Jason parks2011-06-011-17/+41
|\ \ \
| * | | Enable NFC after the device is unlocked.Jason parks2011-05-271-17/+41
* | | | Check whether an activity is enabled before adding to the chooser.Martijn Coenen2011-05-311-1/+24
* | | | Backup NFC preferences.Martijn Coenen2011-05-312-1/+34
* | | | Implement Mifare Ultralight-C detection.Martijn Coenen2011-05-271-0/+59
|/ / /
* | | Implement callback interface for Ndef push.Jason parks2011-05-242-1/+54
|/ /
* | am 7a7f8f8f: Only execute the teardown APDUs when a package is being fully re...Jeff Hamilton2011-04-271-21/+25
|\ \ | |/
| * Only execute the teardown APDUs when a package is being fully removed.Jeff Hamilton2011-04-201-21/+25
* | am 5e7b58d9: Don\'t crash when an unregistered package is removed.Jeff Hamilton2011-04-111-8/+17
|\ \ | |/
| * Don't crash when an unregistered package is removed.Jeff Hamilton2011-04-031-8/+17