summaryrefslogtreecommitdiffstats
path: root/nci
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2520-635/+677
|\
| * Don't overwrite SWP_CFG on SE pipe enable/disable.Martijn Coenen2013-05-011-23/+47
| * Fix RF field stuck on race condition.Martijn Coenen2013-04-161-1/+7
| * Don't restart RF discovery if not needed.Martijn Coenen2013-04-151-9/+7
| * Merge "Add liblog" into jb-mr2-devYing Wang2013-04-101-0/+1
| |\
| | * Add liblogYing Wang2013-04-091-0/+1
| * | Properly reset field / listen mode flags in SE object.Martijn Coenen2013-04-093-14/+67
| |/
| * Fix race condition between NFC disabling and field events.Martijn Coenen2013-04-071-3/+0
| * Deal with pre-MR2 PN544 NXP stack LLCP bugs.Martijn Coenen2013-03-295-4/+49
| * Re-enable dynamic UICC idle timeout switching.Martijn Coenen2013-03-271-0/+6
| * Update JNI to work with latest stack drop.Martijn Coenen2013-03-273-47/+36
| * Don't dynamically enable/disable UICC timeout.Martijn Coenen2013-03-181-6/+0
| * Wait for UICC_IDLE config event to complete.Martijn Coenen2013-03-132-37/+32
| * Merge "Disable UICC_IDLE feature when host is talking to SE." into jb-mr2-devMartijn Coenen2013-03-111-0/+13
| |\
| | * Disable UICC_IDLE feature when host is talking to SE.Martijn Coenen2013-03-111-0/+13
| * | Increase LLCP data-link connection timeout to 2000 ms.Martijn Coenen2013-03-111-1/+10
| |/
| * Merge "Support for Kovio tags via NfcBarcode API class"Martijn Coenen2013-02-225-3/+23
| |\
| | * Support for Kovio tags via NfcBarcode API classEvan Chu2013-02-225-3/+23
| * | Return more accurate errors for NfcEe.open.Martijn Coenen2013-02-121-2/+15
| |/
| * am f843d899: Merge "Fix NFC JNI local reference and pin table leaks."Elliott Hughes2012-12-2115-525/+404
| |\
| | * Fix NFC JNI local reference and pin table leaks.Elliott Hughes2012-12-1815-525/+404
* | | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...mr1.1-stagingSteve Kondik2013-02-123-43/+43
|\| |
| * | Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8The Android Open Source Project2012-12-133-43/+43
| |/
| * Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01The Android Open Source Project2012-12-1342-0/+16797
* Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-11-211-0/+12
* Reset RF field status on SE activation.Martijn Coenen2012-10-221-0/+5
* am 547b58f4: Fix tag not deactivating to sleep during reconnect.Evan Chu2012-10-161-8/+9
|\
| * Fix tag not deactivating to sleep during reconnect.Evan Chu2012-10-161-8/+9
* | am a15b24e9: Check for invalid handle before configuring secure element.Evan Chu2012-10-162-1/+5
|\|
| * Check for invalid handle before configuring secure element.Evan Chu2012-10-162-1/+5
* | Don't hold a timed wakelock.Martijn Coenen2012-10-121-1/+2
* | am a949c743: Fast-fail SE open if it\'s activated in listen mode.Martijn Coenen2012-10-116-17/+227
|\|
| * Fast-fail SE open if it's activated in listen mode.Martijn Coenen2012-10-116-17/+227
| * Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)Paul Chaisson2012-10-111-1/+44
* | am accbb8c9: Don\'t return target lost in case of NACK for T2T.Martijn Coenen2012-10-091-14/+12
|\|
| * Don't return target lost in case of NACK for T2T.Martijn Coenen2012-10-091-14/+12
* | Set EE wipe APDUs for NCI stack.Martijn Coenen2012-10-081-1/+13
* | am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changedEvan Chu2012-10-051-2/+6
|\|
| * NFA_HciAddStaticPipe()'s parameters changedEvan Chu2012-10-041-2/+6
* | Use RF_ACTIVATE/DEACTIVATE to generate RF events.Paul Chaisson2012-10-041-1/+44
* | Merge "NfcAdapterExtras: add driver name." into jb-mr1-devmike wakerly2012-10-031-0/+7
|\ \ | |/ |/|
| * NfcAdapterExtras: add driver name.mike wakerly2012-10-031-0/+7
* | Fix locking around power state.Evan Chu2012-10-033-10/+34
|/
* Substitute empty select for configurable AID.Paul Chaisson2012-10-022-1/+47
* Merge "Fix native crash during RF field notifications." into jb-broadcom-nfcMartijn Coenen2012-10-011-1/+1
|\
| * Fix native crash during RF field notifications.Martijn Coenen2012-10-011-1/+1
* | Power up the NFCC when DH wants to talk to the SE.Paul Chaisson2012-09-305-53/+73
* | Do not activate a tag during NFC disable.Evan Chu2012-09-302-3/+9
|/
* Disable all RF activity when DH connects to SE.Martijn Coenen2012-09-262-1/+13
* Enable/disable RF discovery only when needed.Martijn Coenen2012-09-261-4/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:53:12 +0000