summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| |\
| | * Don't hold the routing wakelock longer than a minute.Martijn Coenen2012-09-211-2/+6
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / /