| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac... | Steve Kondik | 2013-02-12 | 9 | -756/+1117 |
| |\ |
|
| | * | Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8 | The Android Open Source Project | 2012-12-13 | 9 | -756/+1117 |
| | * | Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01 | The Android Open Source Project | 2012-12-13 | 14 | -305/+655 |
| * | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa... | Steve Kondik | 2012-11-21 | 22 | -1892/+690 |
| |\ \ |
|
| | * | | Serialize applying card emulation route. | Martijn Coenen | 2012-10-25 | 1 | -1/+10 |
| | * | | Hold a wakelock during initialisation. | Martijn Coenen | 2012-10-24 | 1 | -45/+75 |
| | * | | Delay sending EE-wipe APDUs. | Martijn Coenen | 2012-10-23 | 1 | -0/+7 |
| | * | | Fix wrong Beam image scaling on sw600 and larger devices. | Martijn Coenen | 2012-10-23 | 1 | -3/+13 |
| | * | | Fix Beam animation for non-owner user. | Martijn Coenen | 2012-10-15 | 2 | -0/+3 |
| | * | | Don't hold a timed wakelock. | Martijn Coenen | 2012-10-12 | 1 | -5/+1 |
| | * | | am a949c743: Fast-fail SE open if it\'s activated in listen mode. | Martijn Coenen | 2012-10-11 | 2 | -0/+44 |
| | |\ \ |
|
| | | * | | Fast-fail SE open if it's activated in listen mode. | Martijn Coenen | 2012-10-11 | 2 | -0/+44 |
| | * | | | NFC changes for multi-user support. | Martijn Coenen | 2012-10-08 | 7 | -92/+165 |
| | * | | | am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into j... | Martijn Coenen | 2012-10-05 | 1 | -1/+1 |
| | |\ \ \
| | |/ / |
|
| | | * | | Increase default transceive timeout to SE to 30s. | Martijn Coenen | 2012-10-04 | 1 | -1/+1 |
| | * | | | NfcAdapterExtras: add driver name. | mike wakerly | 2012-10-03 | 2 | -0/+8 |
| | * | | | am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection. | Martijn Coenen | 2012-09-26 | 2 | -107/+159 |
| | |\ \ \
| | |/ / |
|
| | | * | | Fix NFC->Bluetooth headset/a2dp connection. | Martijn Coenen | 2012-09-25 | 2 | -107/+159 |
| | * | | | Don't hold the routing wakelock longer than a minute. | Martijn Coenen | 2012-09-21 | 1 | -2/+6 |
| | * | | | Merge NFCEE wakelocks. | Martijn Coenen | 2012-09-18 | 1 | -19/+12 |
| | * | | | Add FLAG_ACTIVITY_NEW_TASK to viewIntent | Doris Liu | 2012-09-07 | 1 | -3/+2 |
| | * | | | Do not dispatch empty NDEF tags as NDEF_DISCOVERED. | Martijn Coenen | 2012-09-06 | 1 | -1/+4 |
| | * | | | am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent. | Martijn Coenen | 2012-09-06 | 1 | -1/+2 |
| | |\ \ \
| | |/ / |
|
| | | * | | Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent. | Martijn Coenen | 2012-09-04 | 1 | -1/+2 |
| | * | | | Use new display manager API. | Jeff Brown | 2012-08-19 | 1 | -1/+1 |
| | |/ / |
|
| | * | | Don't call applyRouting on disable(). | Martijn Coenen | 2012-08-16 | 1 | -1/+0 |
| | * | | NfcService: hold a wake lock around transceive(). | mike wakerly | 2012-08-09 | 1 | -22/+72 |
| | * | | Allow different default MIU / window sizes. | Martijn Coenen | 2012-08-07 | 5 | -11/+61 |
| | * | | am bb65a8d8: Allow NfcB connects in NCI stack. | Martijn Coenen | 2012-08-07 | 1 | -4/+0 |
| | |\ \ |
|
| | | * | | Allow NfcB connects in NCI stack. | Martijn Coenen | 2012-08-07 | 1 | -4/+0 |
| | | * | | Fix race conditions in NdefPushServer. (DO NOT MERGE) | Martijn Coenen | 2012-08-02 | 1 | -19/+48 |
| | | * | | NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE) | Martijn Coenen | 2012-08-01 | 2 | -17/+11 |
| | | * | | Fix type of collision resolution record. (DO NOT MERGE) | Martijn Coenen | 2012-08-01 | 1 | -1/+3 |
| | | * | | Implement connection handover LLCP service. (DO NOT MERGE) | Martijn Coenen | 2012-08-01 | 6 | -7/+414 |
| | | * | | Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE) | Martijn Coenen | 2012-08-01 | 8 | -1552/+2 |
| | | * | | Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NO... | Martijn Coenen | 2012-08-01 | 8 | -2/+1552 |
| | | * | | Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE) | Martijn Coenen | 2012-08-01 | 8 | -1552/+2 |
| | * | | | Fix race conditions in NdefPushServer. | Martijn Coenen | 2012-08-03 | 1 | -19/+48 |
| | * | | | NFC: Initial NCI DeviceHost and JNI implementation. | Martijn Coenen | 2012-07-27 | 2 | -17/+11 |
| | | |/
| |/| |
|
| | * | | Move NXP JNI and DeviceHost implementation into separate dir. | Martijn Coenen | 2012-07-25 | 8 | -1552/+2 |
| | * | | Revert "Move NXP JNI and DeviceHost implementation into separate dir." | Martijn Coenen | 2012-07-24 | 8 | -2/+1552 |
| | * | | Move NXP JNI and DeviceHost implementation into separate dir. | Martijn Coenen | 2012-07-24 | 8 | -1552/+2 |
| | * | | Fix type of collision resolution record. | Martijn Coenen | 2012-07-23 | 1 | -1/+3 |
| | * | | Implement connection handover LLCP service. | Martijn Coenen | 2012-07-16 | 6 | -7/+414 |
| | * | | am fef4b82c: am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into jb... | Martijn Coenen | 2012-06-06 | 2 | -6/+24 |
| | |\ \
| | |/ |
|
| | * | | am d560e24e: am f4392711: Add watchdog to applyRouting(). | Martijn Coenen | 2012-05-31 | 1 | -46/+53 |
| | |\ \ |
|
| | * \ \ | am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-dev | Martijn Coenen | 2012-05-25 | 2 | -18/+26 |
| | |\ \ \ |
|
| | * \ \ \ | am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ... | Martijn Coenen | 2012-05-25 | 3 | -5/+78 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | am 7d44aa52: am befa3d6d: Show time in NFC handover notifications. | Martijn Coenen | 2012-05-22 | 1 | -4/+0 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames. | Martijn Coenen | 2012-05-21 | 1 | -2/+15 |
| | |\ \ \ \ \ \ |
|
