summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Fix NFC->Bluetooth headset/a2dp connection.Martijn Coenen2012-09-252-107/+159
* 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
* Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
|\
| * Remove "brcm" in namesEvan Chu2012-09-068-63/+62
* | Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-041-1/+2
|/
* 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
* In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
* Don't report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
* During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
* Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
* Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
* Remove gJniVersion; add thread-synchronizationEvan Chu2012-08-166-61/+51
* Don't call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
* Reduce compilation warnings in NFC JNI.Evan Chu2012-08-152-2/+3
* Remove whitespace from NFC NCI JNI.Evan Chu2012-08-1030-772/+746
* NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
* Support for setting p2p target/initiator modes in NCI.Martijn Coenen2012-08-093-0/+44
* Fix one last user of astl to use stlport instead...Elliott Hughes2012-08-081-2/+5
* Allow different default MIU / window sizes.Martijn Coenen2012-08-077-14/+95
* am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
|\
| * Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | |\
* | | \ am 295c9c25: am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
|\ \ \ \ | |/ / /
| * | | am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
| |\ \ \
| | * \ \ am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
| | |\ \ \
| | | * | | Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
* | | | | | am 776b2480: (-s ours) am 91e82624: am 618ed5a4: (-s ours) Dump NFC controlle...Martijn Coenen2012-08-070-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 91e82624: am 618ed5a4: (-s ours) Dump NFC controller firmware version in t...Martijn Coenen2012-08-070-0/+0
| |\ \ \ \ \ | | |/ / / /