summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...Steve Kondik2013-02-129-756/+1117
|\
| * Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8The Android Open Source Project2012-12-139-756/+1117
| * Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01The Android Open Source Project2012-12-1314-305/+655
* | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-11-2122-1892/+690
|\ \
| * | Serialize applying card emulation route.Martijn Coenen2012-10-251-1/+10
| * | Hold a wakelock during initialisation.Martijn Coenen2012-10-241-45/+75
| * | Delay sending EE-wipe APDUs.Martijn Coenen2012-10-231-0/+7
| * | Fix wrong Beam image scaling on sw600 and larger devices.Martijn Coenen2012-10-231-3/+13
| * | Fix Beam animation for non-owner user.Martijn Coenen2012-10-152-0/+3
| * | Don't hold a timed wakelock.Martijn Coenen2012-10-121-5/+1
| * | am a949c743: Fast-fail SE open if it\'s activated in listen mode.Martijn Coenen2012-10-112-0/+44
| |\ \
| | * | Fast-fail SE open if it's activated in listen mode.Martijn Coenen2012-10-112-0/+44
| * | | NFC changes for multi-user support.Martijn Coenen2012-10-087-92/+165
| * | | am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into j...Martijn Coenen2012-10-051-1/+1
| |\ \ \ | | |/ /
| | * | Increase default transceive timeout to SE to 30s.Martijn Coenen2012-10-041-1/+1
| * | | NfcAdapterExtras: add driver name.mike wakerly2012-10-032-0/+8
| * | | am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.Martijn Coenen2012-09-262-107/+159
| |\ \ \ | | |/ /
| | * | Fix NFC->Bluetooth headset/a2dp connection.Martijn Coenen2012-09-252-107/+159
| * | | Don't hold the routing wakelock longer than a minute.Martijn Coenen2012-09-211-2/+6
| * | | Merge NFCEE wakelocks.Martijn Coenen2012-09-181-19/+12
| * | | Add FLAG_ACTIVITY_NEW_TASK to viewIntentDoris Liu2012-09-071-3/+2
| * | | Do not dispatch empty NDEF tags as NDEF_DISCOVERED.Martijn Coenen2012-09-061-1/+4
| * | | am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-061-1/+2
| |\ \ \ | | |/ /
| | * | Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-041-1/+2
| * | | Use new display manager API.Jeff Brown2012-08-191-1/+1
| |/ /
| * | Don't call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
| * | NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
| * | Allow different default MIU / window sizes.Martijn Coenen2012-08-075-11/+61
| * | 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
| |\ \ | | |/
| * | am d560e24e: am f4392711: 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
| |\ \ \
| * \ \ \ am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ...Martijn Coenen2012-05-253-5/+78
| |\ \ \ \
| * \ \ \ \ am 7d44aa52: am befa3d6d: 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
| |\ \ \ \ \ \