summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-071-4/+0
|\
| * Allow NfcB connects in NCI stack.Martijn Coenen2012-08-071-4/+0
| * Fix race conditions in NdefPushServer. (DO NOT MERGE)Martijn Coenen2012-08-021-19/+48
| * NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)Martijn Coenen2012-08-012-17/+11
| * Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-011-1/+3
| * Implement connection handover LLCP service. (DO NOT MERGE)Martijn Coenen2012-08-016-7/+414
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-018-1552/+2
| * Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NO...Martijn Coenen2012-08-018-2/+1552
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-018-1552/+2
* | Fix race conditions in NdefPushServer.Martijn Coenen2012-08-031-19/+48
* | NFC: Initial NCI DeviceHost and JNI implementation.Martijn Coenen2012-07-272-17/+11
* | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-258-1552/+2
* | Revert "Move NXP JNI and DeviceHost implementation into separate dir."Martijn Coenen2012-07-248-2/+1552
* | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-248-1552/+2
* | Fix type of collision resolution record.Martijn Coenen2012-07-231-1/+3
* | Implement connection handover LLCP service.Martijn Coenen2012-07-166-7/+414
* | am fef4b82c: am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into jb...Martijn Coenen2012-06-062-6/+24
|\ \ | |/
| * Don't assume Bluetooth is present.Martijn Coenen2012-06-062-6/+24
* | am d560e24e: am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
|\ \ | |/
| * Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
* | am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
|\ \ | |/
| * Use new handover intent actions.Martijn Coenen2012-05-252-18/+26
* | am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ...Martijn Coenen2012-05-253-5/+78
|\ \ | |/
| * Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-253-5/+78
* | am 7d44aa52: am befa3d6d: Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
|\ \ | |/
| * Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
* | am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-211-2/+15
|\ \ | |/
| * Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-181-2/+15
* | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-211-1/+5
|\ \ | |/
| * Don't use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
* | am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." in...Martijn Coenen2012-05-211-1/+9
|\ \ | |/
| * 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
* | | am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers...Martijn Coenen2012-05-212-30/+109
|\ \ \ | |/ /
| * | 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
* | | am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-211-1/+0
|\ \ \ | |/ /
| * | Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-171-1/+0
| |\ \ | | |/ | |/|
| | * Eliminate obsolete flag.Craig Mautner2012-05-171-1/+0
* | | am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-fil...Martijn Coenen2012-05-172-65/+286
|\ \ \ | |/ /
| * | Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-152-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
* | 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
generated by cgit v1.1 at 2024-12-23 08:06:01 +0000