Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover. | Martijn Coenen | 2012-05-21 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." in... | Martijn Coenen | 2012-05-21 | 1 | -1/+9 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers... | Martijn Coenen | 2012-05-21 | 2 | -30/+109 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev | Craig Mautner | 2012-05-21 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-fil... | Martijn Coenen | 2012-05-17 | 2 | -65/+286 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of c989f25d to master | Justin Koh | 2012-05-17 | 1 | -20/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Don't instantiate sendUi in Nfc if we are in appliance mode. | Justin Koh | 2012-05-17 | 1 | -20/+33 | |
| | * | | | | | | | | | | | | Use the new "appliance" ui mode configuration to determine whether to show nf... | Joe Onorato | 2011-12-14 | 1 | -1/+10 | |
* | | | | | | | | | | | | | | Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/pa... | Steve Kondik | 2012-10-09 | 6 | -8/+417 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix type of collision resolution record. | Martijn Coenen | 2012-07-25 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | Implement connection handover LLCP service. | Martijn Coenen | 2012-07-25 | 6 | -7/+414 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | card emulation patch port to JB | doug yeager | 2012-08-28 | 3 | -0/+56 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Don't assume Bluetooth is present. | Martijn Coenen | 2012-06-06 | 2 | -6/+24 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Add watchdog to applyRouting(). | Martijn Coenen | 2012-05-31 | 1 | -46/+53 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Use new handover intent actions. | Martijn Coenen | 2012-05-25 | 2 | -18/+26 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | Fall back to NDEF push if handover SNEP get fails. | Martijn Coenen | 2012-05-25 | 3 | -5/+78 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Show time in NFC handover notifications. | Martijn Coenen | 2012-05-22 | 1 | -4/+0 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Bluetooth Beam: generate unique filenames. | Martijn Coenen | 2012-05-18 | 1 | -2/+15 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Don't use NPP for connection handover. | Martijn Coenen | 2012-05-18 | 1 | -1/+5 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge "Close NFCEE when NFC is being shut down." into jb-dev | Martijn Coenen | 2012-05-17 | 1 | -1/+9 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Close NFCEE when NFC is being shut down. | Martijn Coenen | 2012-05-17 | 1 | -1/+9 | |
* | | | | | | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev | Martijn Coenen | 2012-05-17 | 2 | -30/+109 | |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | ||||||
| * | | | | Allow cancelling of Bluetooth Beam transfers. | Martijn Coenen | 2012-05-16 | 2 | -30/+109 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge "Eliminate obsolete flag." into jb-dev | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Eliminate obsolete flag. | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
| |/ / | ||||||
* | | | Bluetooth Beam handover: deal with multi-file transfers. | Martijn Coenen | 2012-05-15 | 2 | -65/+286 | |
|/ / | ||||||
* | | UI confirmation for pairing a BT device through NFC. | Martijn Coenen | 2012-05-10 | 2 | -5/+80 | |
* | | Bluetooth Beam bug fixes, UX and i18n. | Martijn Coenen | 2012-05-10 | 5 | -113/+293 | |
* | | Call right Bluetooth enable API. | Martijn Coenen | 2012-04-26 | 1 | -1/+1 | |
* | | Merge "Latest changes for Bluetooth Beam." | Martijn Coenen | 2012-04-24 | 3 | -39/+388 | |
|\ \ | ||||||
| * | | Latest changes for Bluetooth Beam. | Martijn Coenen | 2012-04-20 | 3 | -39/+388 | |
* | | | Added shared prefs for SE wired mode | Sunil Jogi | 2012-04-20 | 3 | -13/+66 | |
* | | | Updated disable method | Sunil Jogi | 2012-04-20 | 1 | -2/+5 | |
|/ / | ||||||
* | | Support for the new Uri[] Beam push API. | Martijn Coenen | 2012-04-12 | 3 | -36/+57 | |
* | | Force bluetooth OPP to handle ACTION_SEND. | Martijn Coenen | 2012-04-05 | 1 | -1/+2 | |
* | | Add support for making Mifare Classic readonly. | Martijn Coenen | 2012-04-05 | 2 | -3/+11 | |
* | | First cut at Bluetooth Beam | Nick Pelly | 2012-04-04 | 5 | -11/+208 | |
* | | Merge "Support for querying extended length APDU support." | Martijn Coenen | 2012-04-04 | 3 | -0/+12 | |
|\ \ | ||||||
| * | | Support for querying extended length APDU support. | Martijn Coenen | 2012-04-02 | 3 | -0/+12 | |
* | | | Allow applications to disable default Beam behavior. | Martijn Coenen | 2012-04-04 | 1 | -13/+43 | |
|/ / | ||||||
* | | Merge "Let connect() fail with an I/O exception if tag has left the field." | Martijn Coenen | 2012-03-30 | 1 | -0/+4 | |
|\ \ | ||||||
| * | | Let connect() fail with an I/O exception if tag has left the field. | Martijn Coenen | 2012-03-29 | 1 | -0/+4 | |
* | | | Merge "Remove permissions check from the TagService." | Martijn Coenen | 2012-03-30 | 1 | -24/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Remove permissions check from the TagService. | Martijn Coenen | 2012-03-29 | 1 | -24/+2 | |
* | | | Merge "Fix NPE when there's NDEF data we can't dispatch." | Martijn Coenen | 2012-03-29 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | Fix NPE when there's NDEF data we can't dispatch. | Martijn Coenen | 2012-03-08 | 1 | -1/+2 | |
* | | | | Merge "Get rid of getLastError()." | Martijn Coenen | 2012-03-29 | 3 | -9/+2 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Get rid of getLastError(). | Martijn Coenen | 2012-03-29 | 3 | -9/+2 | |
* | | | | Merge "Don't crash on passing invalid data to NfcService." | Martijn Coenen | 2012-03-29 | 1 | -0/+2 | |
|\ \ \ \ | ||||||
| * | | | | Don't crash on passing invalid data to NfcService. | Martijn Coenen | 2012-03-28 | 1 | -0/+2 |