summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Set EE wipe APDUs for NCI stack.Martijn Coenen2012-10-081-1/+13
* am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into j...Martijn Coenen2012-10-051-1/+1
|\
| * Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfcMartijn Coenen2012-10-051-1/+1
| |\
| | * Increase default transceive timeout to SE to 30s.Martijn Coenen2012-10-041-1/+1
* | | 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-034-0/+22
|\ \
| * | NfcAdapterExtras: add driver name.mike wakerly2012-10-034-0/+22
* | | am c7d56f7e: Fix locking around power state.Evan Chu2012-10-033-10/+34
|\ \ \ | |/ / |/| / | |/
| * Fix locking around power state.Evan Chu2012-10-033-10/+34
* | am e897cc40: Substitute empty select for configurable AID.Paul Chaisson2012-10-022-1/+47
|\ \ | |/
| * Substitute empty select for configurable AID.Paul Chaisson2012-10-022-1/+47
* | am 7379fb73: Merge "Fix native crash during RF field notifications." into jb-...Martijn Coenen2012-10-011-1/+1
|\ \ | |/
| * 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
* | | am 43727fbb: Power up the NFCC when DH wants to talk to the SE.Paul Chaisson2012-09-305-53/+73
|\ \ \ | |/ /
| * | Power up the NFCC when DH wants to talk to the SE.Paul Chaisson2012-09-305-53/+73
* | | am a80bb9a5: Do not activate a tag during NFC disable.Evan Chu2012-09-302-3/+9
|\ \ \ | |/ /
| * | Do not activate a tag during NFC disable.Evan Chu2012-09-302-3/+9
| |/
* | am 914d6caa: Disable all RF activity when DH connects to SE.Martijn Coenen2012-09-282-1/+13
|\ \ | |/
| * Disable all RF activity when DH connects to SE.Martijn Coenen2012-09-262-1/+13
* | am 18ccd96a: Enable/disable RF discovery only when needed.Martijn Coenen2012-09-261-4/+11
|\ \ | |/
| * Enable/disable RF discovery only when needed.Martijn Coenen2012-09-261-4/+11
* | am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.Martijn Coenen2012-09-262-107/+159
|\ \ | |/
| * Fix NFC->Bluetooth headset/a2dp connection.Martijn Coenen2012-09-252-107/+159
* | am 2f9909a2: Tell secure element to warm-reset when closing pipe to DH.Evan Chu2012-09-252-1/+36
|\ \ | |/
| * Tell secure element to warm-reset when closing pipe to DH.Evan Chu2012-09-252-1/+36
* | am dc8a29da: Fix NXP PN544 controller interop with Broadcom controllerEvan Chu2012-09-256-56/+463
|\ \ | |/
| * Fix NXP PN544 controller interop with Broadcom controllerEvan Chu2012-09-256-56/+463
* | am 5b26e322: Don\'t try to set low-power mode if NFA_enable fails.Evan Chu2012-09-251-1/+2
|\ \ | |/
| * Don't try to set low-power mode if NFA_enable fails.Evan Chu2012-09-251-1/+2
* | Merge "Don't hold the routing wakelock longer than a minute." into jb-mr1-devMartijn Coenen2012-09-211-2/+6
|\ \
| * | Don't hold the routing wakelock longer than a minute.Martijn Coenen2012-09-211-2/+6
* | | am 46974c09: Don\'t print error for resetting SE route.Martijn Coenen2012-09-201-1/+1
|\ \ \ | |/ / |/| / | |/
| * Don't print error for resetting SE route.Martijn Coenen2012-09-201-1/+1
* | 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
|\ \ \ | |/ /