summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update for LLCP V(SA) internal variableSunil Jogi2012-01-271-6/+3
* LLCP 1.1: Fix some bugs.Martijn Coenen2012-01-272-3/+14
* Adding support for handling maximum length supported by peerSunil Jogi2012-01-274-21/+34
* LLCP 1.1 implementation.Sunil Jogi2012-01-2711-108/+912
* LLCP 1.1: allow pending operations on connectionless.Sunil Jogi2012-01-276-469/+595
* Don't overwrite psUpperLayerContext when reconfiguring the SE.Martijn Coenen2012-01-202-54/+49
* Clear out send/recv callbacks for connectionless sockets.Martijn Coenen2012-01-201-3/+14
* Prevent LLCP stack from deactiving twice.Martijn Coenen2012-01-131-2/+2
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-065-15/+15
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-054-10/+10
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-7/+7
* am 593d6d4a: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\
| * Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\
* | \ Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-100-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| |\ \ | | |/ | |/|
* | | am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-076-114/+56
|\ \ \ | |/ /
| * | Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-036-114/+56
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ | |/ / |/| / | |/
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| |\ |/ /
| * merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| |\
| | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-020-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-250-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-220-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-170-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-030-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-280-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-220-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-210-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-200-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-190-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-150-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Revert "Patch to decrease the maximum packet size for NFC firmware download"Nick Pelly2011-07-141-3/+3
* | | | | | | | | | | | | | | | | | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode.Nick Pelly2011-10-252-2/+6
* | | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode.Nick Pelly2011-10-252-2/+6
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MER...Martijn Coenen2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0Martijn Coenen2011-10-211-35/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Remove NFC I2C workaround for Prime (DO NOT MERGE).Martijn Coenen2011-10-211-35/+5
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Fixes to LLC and DAL to handle unreliable UART.Nick Pelly2011-10-216-21/+178
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am 6dd94832: Manual port of 6900b4 from gingerbread:Rob von Behren2011-09-2210-336/+1390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Manual port of 6900b4 from gingerbread:Rob von Behren2011-09-2010-336/+1390
| |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ keep history after reconcile of gingerbread-releaseThe Android Automerger2011-09-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ keep history after reset to GRK39DEd Heyl2011-09-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | keep historyandroid-merger2011-09-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ...Jeff Hamilton2011-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |