summaryrefslogtreecommitdiffstats
path: root/nci
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...Steve 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
* Tell secure element to warm-reset when closing pipe to DH.Evan Chu2012-09-252-1/+36
* Fix NXP PN544 controller interop with Broadcom controllerEvan Chu2012-09-256-56/+463
* Don't try to set low-power mode if NFA_enable fails.Evan Chu2012-09-251-1/+2
* Don't print error for resetting SE route.Martijn Coenen2012-09-201-1/+1
* Grant licenseEvan Chu2012-09-201-0/+50
* copyright by The Android Open Source ProjectEvan Chu2012-09-1931-263/+425
* Fix locking in PeerToPeer.Martijn Coenen2012-09-184-255/+462
* Integrate NFC Hardware Abstraction Layer.Evan Chu2012-09-185-76/+6
* Merge "User proper error code during tag reading" into jb-broadcom-nfcMartijn Coenen2012-09-111-1/+1
|\
| * User proper error code during tag readingEvan Chu2012-09-111-1/+1
* | Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfcMartijn Coenen2012-09-112-2/+4
|\ \ | |/
| * Use correct app name for NFA_HciDeregister()Evan Chu2012-09-112-2/+4
* | Fix NFC low-power modes.Evan Chu2012-09-071-11/+24
|/
* Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
* Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-062-451/+4
* Correct spelling.Evan Chu2012-09-062-4/+4
* correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
* handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
* Remove "brcm" in namesEvan Chu2012-09-068-63/+62
* Upgrade to stack NFA_MI_1.03.36Evan Chu2012-08-312-9/+13
* Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48