summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-211-1/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." in...Martijn Coenen2012-05-211-1/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers...Martijn Coenen2012-05-212-30/+109
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-211-1/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-fil...Martijn Coenen2012-05-172-65/+286
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of c989f25d to masterJustin Koh2012-05-171-20/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Don't instantiate sendUi in Nfc if we are in appliance mode.Justin Koh2012-05-171-20/+33
| | * | | | | | | | | | | | Use the new "appliance" ui mode configuration to determine whether to show nf...Joe Onorato2011-12-141-1/+10
* | | | | | | | | | | | | | Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-10-096-8/+417
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
| * | | | | | | | | | | | | | Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | card emulation patch port to JBdoug yeager2012-08-283-0/+56
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Don't assume Bluetooth is present.Martijn Coenen2012-06-062-6/+24
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Use new handover intent actions.Martijn Coenen2012-05-252-18/+26
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-253-5/+78
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-181-2/+15
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Don't use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Close NFCEE when NFC is being shut down." into jb-devMartijn Coenen2012-05-171-1/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Close NFCEE when NFC is being shut down.Martijn Coenen2012-05-171-1/+9
* | | | | | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-172-30/+109
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-162-30/+109
| | |_|/ | |/| |
* | | | Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-171-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Eliminate obsolete flag.Craig Mautner2012-05-171-1/+0
| |/ /
* | | Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-152-65/+286
|/ /
* | UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-102-5/+80
* | Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-105-113/+293
* | Call right Bluetooth enable API.Martijn Coenen2012-04-261-1/+1
* | Merge "Latest changes for Bluetooth Beam."Martijn Coenen2012-04-243-39/+388
|\ \
| * | Latest changes for Bluetooth Beam.Martijn Coenen2012-04-203-39/+388
* | | Added shared prefs for SE wired modeSunil Jogi2012-04-203-13/+66
* | | Updated disable methodSunil Jogi2012-04-201-2/+5
|/ /
* | Support for the new Uri[] Beam push API.Martijn Coenen2012-04-123-36/+57
* | Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
* | Add support for making Mifare Classic readonly.Martijn Coenen2012-04-052-3/+11
* | First cut at Bluetooth BeamNick Pelly2012-04-045-11/+208
* | Merge "Support for querying extended length APDU support."Martijn Coenen2012-04-043-0/+12
|\ \
| * | Support for querying extended length APDU support.Martijn Coenen2012-04-023-0/+12
* | | Allow applications to disable default Beam behavior.Martijn Coenen2012-04-041-13/+43
|/ /
* | Merge "Let connect() fail with an I/O exception if tag has left the field."Martijn Coenen2012-03-301-0/+4
|\ \
| * | Let connect() fail with an I/O exception if tag has left the field.Martijn Coenen2012-03-291-0/+4
* | | Merge "Remove permissions check from the TagService."Martijn Coenen2012-03-301-24/+2
|\ \ \ | |/ /
| * | Remove permissions check from the TagService.Martijn Coenen2012-03-291-24/+2
* | | Merge "Fix NPE when there's NDEF data we can't dispatch."Martijn Coenen2012-03-291-1/+2
|\ \ \
| * | | Fix NPE when there's NDEF data we can't dispatch.Martijn Coenen2012-03-081-1/+2
* | | | Merge "Get rid of getLastError()."Martijn Coenen2012-03-293-9/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Get rid of getLastError().Martijn Coenen2012-03-293-9/+2
* | | | Merge "Don't crash on passing invalid data to NfcService."Martijn Coenen2012-03-291-0/+2
|\ \ \ \
| * | | | Don't crash on passing invalid data to NfcService.Martijn Coenen2012-03-281-0/+2