Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-27 | 0 | -0/+0 |
|\ | |||||
| * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-26 | 0 | -0/+0 |
| |\ | |||||
| | * | Don't hold the routing wakelock longer than a minute. | Martijn Coenen | 2012-09-21 | 1 | -2/+6 |
| | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-21 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-19 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-12 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-09 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-06 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-04 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-28 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-27 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-20 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-14 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
* | | | | | | | | | | | | | | | | \ | am 18ccd96a: Enable/disable RF discovery only when needed. | Martijn Coenen | 2012-09-26 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Enable/disable RF discovery only when needed. | Martijn Coenen | 2012-09-26 | 1 | -4/+11 |
* | | | | | | | | | | | | | | | | | | | am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection. | Martijn Coenen | 2012-09-26 | 2 | -107/+159 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fix NFC->Bluetooth headset/a2dp connection. | Martijn Coenen | 2012-09-25 | 2 | -107/+159 |
* | | | | | | | | | | | | | | | | | | am 2f9909a2: Tell secure element to warm-reset when closing pipe to DH. | Evan Chu | 2012-09-25 | 2 | -1/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Tell secure element to warm-reset when closing pipe to DH. | Evan Chu | 2012-09-25 | 2 | -1/+36 |
* | | | | | | | | | | | | | | | | | | am dc8a29da: Fix NXP PN544 controller interop with Broadcom controller | Evan Chu | 2012-09-25 | 6 | -56/+463 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Fix NXP PN544 controller interop with Broadcom controller | Evan Chu | 2012-09-25 | 6 | -56/+463 |
* | | | | | | | | | | | | | | | | | | am 5b26e322: Don\'t try to set low-power mode if NFA_enable fails. | Evan Chu | 2012-09-25 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Don't try to set low-power mode if NFA_enable fails. | Evan Chu | 2012-09-25 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | Merge "Don't hold the routing wakelock longer than a minute." into jb-mr1-dev | Martijn Coenen | 2012-09-21 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Don't hold the routing wakelock longer than a minute. | Martijn Coenen | 2012-09-21 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | | | am 46974c09: Don\'t print error for resetting SE route. | Martijn Coenen | 2012-09-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Don't print error for resetting SE route. | Martijn Coenen | 2012-09-20 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | am 0873b051: Grant license | Evan Chu | 2012-09-20 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Grant license | Evan Chu | 2012-09-20 | 1 | -0/+50 |
* | | | | | | | | | | | | | | | | | am b95ef0b6: copyright by The Android Open Source Project | Evan Chu | 2012-09-20 | 31 | -263/+425 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | copyright by The Android Open Source Project | Evan Chu | 2012-09-19 | 31 | -263/+425 |
* | | | | | | | | | | | | | | | | Merge "Merge NFCEE wakelocks." into jb-mr1-dev | Martijn Coenen | 2012-09-18 | 1 | -19/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Merge NFCEE wakelocks. | Martijn Coenen | 2012-09-18 | 1 | -19/+12 |
* | | | | | | | | | | | | | | | | | am 7be608bc: Fix locking in PeerToPeer. | Martijn Coenen | 2012-09-18 | 4 | -255/+462 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Fix locking in PeerToPeer. | Martijn Coenen | 2012-09-18 | 4 | -255/+462 |
* | | | | | | | | | | | | | | | | am c6cf8e45: Integrate NFC Hardware Abstraction Layer. | Evan Chu | 2012-09-18 | 5 | -76/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Integrate NFC Hardware Abstraction Layer. | Evan Chu | 2012-09-18 | 5 | -76/+6 |
* | | | | | | | | | | | | | | | am bd233c44: Merge "User proper error code during tag reading" into jb-broadc... | Martijn Coenen | 2012-09-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge "User proper error code during tag reading" into jb-broadcom-nfc | Martijn Coenen | 2012-09-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | User proper error code during tag reading | Evan Chu | 2012-09-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | am a960b02c: Merge "Use correct app name for NFA_HciDeregister()" into jb-bro... | Martijn Coenen | 2012-09-11 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfc | Martijn Coenen | 2012-09-11 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Use correct app name for NFA_HciDeregister() | Evan Chu | 2012-09-11 | 2 | -2/+4 |
* | | | | | | | | | | | | | | | | am cf72e2c3: Fix NFC low-power modes. | Evan Chu | 2012-09-11 | 1 | -11/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Fix NFC low-power modes. | Evan Chu | 2012-09-07 | 1 | -11/+24 |
| |/ / / / / / / / / / / / / / |