summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | am 0873b051: Grant licenseEvan Chu2012-09-201-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Grant licenseEvan Chu2012-09-201-0/+50
| * | | | | | | | | | | | | | | | | | am b95ef0b6: copyright by The Android Open Source ProjectEvan Chu2012-09-2031-263/+425
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | copyright by The Android Open Source ProjectEvan Chu2012-09-1931-263/+425
| * | | | | | | | | | | | | | | | | Merge "Merge NFCEE wakelocks." into jb-mr1-devMartijn Coenen2012-09-181-19/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Merge NFCEE wakelocks.Martijn Coenen2012-09-181-19/+12
| * | | | | | | | | | | | | | | | | | am 7be608bc: Fix locking in PeerToPeer.Martijn Coenen2012-09-184-255/+462
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Fix locking in PeerToPeer.Martijn Coenen2012-09-184-255/+462
| * | | | | | | | | | | | | | | | | am c6cf8e45: Integrate NFC Hardware Abstraction Layer.Evan Chu2012-09-185-76/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Integrate NFC Hardware Abstraction Layer.Evan Chu2012-09-185-76/+6
| * | | | | | | | | | | | | | | | am bd233c44: Merge "User proper error code during tag reading" into jb-broadc...Martijn Coenen2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | am a960b02c: Merge "Use correct app name for NFA_HciDeregister()" into jb-bro...Martijn Coenen2012-09-112-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | am cf72e2c3: Fix NFC low-power modes.Evan Chu2012-09-111-11/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Fix NFC low-power modes.Evan Chu2012-09-071-11/+24
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Add FLAG_ACTIVITY_NEW_TASK to viewIntentDoris Liu2012-09-071-3/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 2bc17929: Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
| * | | | | | | | | | | | | | | am cdf5b0e0: Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-072-451/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-062-451/+4
| * | | | | | | | | | | | | | | Merge "Do not dispatch empty NDEF tags as NDEF_DISCOVERED." into jb-mr1-devMartijn Coenen2012-09-061-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Do not dispatch empty NDEF tags as NDEF_DISCOVERED.Martijn Coenen2012-09-061-1/+4
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 3463d49a: Correct spelling.Evan Chu2012-09-062-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Correct spelling.Evan Chu2012-09-062-4/+4
| * | | | | | | | | | | | | | | am 7e5bdc93: correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
| * | | | | | | | | | | | | | | am 08030f1c: handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
| * | | | | | | | | | | | | | | am cf83b532: Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Remove "brcm" in namesEvan Chu2012-09-068-63/+62
| * | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | am f340f1a0: Upgrade to stack NFA_MI_1.03.36Evan Chu2012-09-042-9/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Upgrade to stack NFA_MI_1.03.36Evan Chu2012-08-312-9/+13
| * | | | | | | | | | | | am 8e9cdd78: Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
| * | | | | | | | | | | | am dfc52b4b: In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
| * | | | | | | | | | | am d1235cf7: Don\'t report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Don't report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
| * | | | | | | | | | am 59ff0d6e: During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
| * | | | | | | | | Use new display manager API.Jeff Brown2012-08-191-1/+1
| * | | | | | | | | am e8e49093: Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
| * | | | | | | | | am 72a693f6: Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /