Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Update for LLCP V(SA) internal variable | Sunil Jogi | 2012-01-27 | 1 | -6/+3 | |
* | LLCP 1.1: Fix some bugs. | Martijn Coenen | 2012-01-27 | 2 | -3/+14 | |
* | Adding support for handling maximum length supported by peer | Sunil Jogi | 2012-01-27 | 4 | -21/+34 | |
* | LLCP 1.1 implementation. | Sunil Jogi | 2012-01-27 | 11 | -108/+912 | |
* | LLCP 1.1: allow pending operations on connectionless. | Sunil Jogi | 2012-01-27 | 6 | -469/+595 | |
* | Don't overwrite psUpperLayerContext when reconfiguring the SE. | Martijn Coenen | 2012-01-20 | 2 | -54/+49 | |
* | Clear out send/recv callbacks for connectionless sockets. | Martijn Coenen | 2012-01-20 | 1 | -3/+14 | |
* | Prevent LLCP stack from deactiving twice. | Martijn Coenen | 2012-01-13 | 1 | -2/+2 | |
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 5 | -15/+15 | |
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-05 | 4 | -10/+10 | |
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 2 | -7/+7 | |
* | am 593d6d4a: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-09 | 0 | -0/+0 | |
|\ | ||||||
| * | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-08 | 0 | -0/+0 | |
| |\ | ||||||
* | \ | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-10 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-08 | 0 | -0/+0 | |
| |\ \ | | |/ | |/| | ||||||
* | | | am b99be65c: Use NFC HAL for some libnfc settings. | Martijn Coenen | 2011-11-07 | 6 | -114/+56 | |
|\ \ \ | |/ / | ||||||
| * | | Use NFC HAL for some libnfc settings. | Martijn Coenen | 2011-11-03 | 6 | -114/+56 | |
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-10-31 | 0 | -0/+0 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-26 | 0 | -0/+0 | |
| |\ |/ / | ||||||
| * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-23 | 0 | -0/+0 | |
| |\ | ||||||
| | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 | |
| | |\ | ||||||
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 | |
| | | |\ | ||||||
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-02 | 0 | -0/+0 | |
| | | | |\ | ||||||
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-25 | 0 | -0/+0 | |
| | | | | |\ | ||||||
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-22 | 0 | -0/+0 | |
| | | | | | |\ | ||||||
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-17 | 0 | -0/+0 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-03 | 0 | -0/+0 | |
| | | | | | | | |\ | ||||||
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-28 | 0 | -0/+0 | |
| | | | | | | | | |\ | ||||||
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-27 | 0 | -0/+0 | |
| | | | | | | | | | |\ | ||||||
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-26 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-22 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | | * | Revert "Patch to decrease the maximum packet size for NFC firmware download" | Nick Pelly | 2011-07-14 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | Merge remote branch 'goog/ics-mr0' into ics-mr1 | Ed Heyl | 2011-10-26 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode. | Nick Pelly | 2011-10-25 | 2 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode. | Nick Pelly | 2011-10-25 | 2 | -2/+6 | |
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MER... | Martijn Coenen | 2011-10-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 | Martijn Coenen | 2011-10-21 | 1 | -35/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Remove NFC I2C workaround for Prime (DO NOT MERGE). | Martijn Coenen | 2011-10-21 | 1 | -35/+5 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Fixes to LLC and DAL to handle unreliable UART. | Nick Pelly | 2011-10-21 | 6 | -21/+178 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | am 6dd94832: Manual port of 6900b4 from gingerbread: | Rob von Behren | 2011-09-22 | 10 | -336/+1390 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Manual port of 6900b4 from gingerbread: | Rob von Behren | 2011-09-20 | 10 | -336/+1390 | |
| |/ / / / / / / / / / / / / / / | ||||||
| | | | | | | | | | | | | | | | | ||||||
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
*-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with gingerbread-release gingerbread-mr4-release | The Android Open Source Project | 2011-09-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | keep history after reconcile of gingerbread-release | The Android Automerger | 2011-09-12 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | keep history after reset to GRK39D | Ed Heyl | 2011-09-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | keep history | android-merger | 2011-09-09 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ... | Jeff Hamilton | 2011-09-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |