summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
|\
| * merge in jb-release history after reset to masterThe Android Automerger2012-02-070-0/+0
| |\
| | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-230-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-170-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-050-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-080-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-260-0/+0
| | | | | | | | | | | |\
* | | | | | | | | | | | | (DEBUG) Add support for setting p2p modes.Martijn Coenen2012-02-174-3/+33
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen2012-02-061-2/+3
* | | | | | | | | | | | Merge "Fixed FRMR sending on invalid LLCP frame received"Martijn Coenen2012-02-062-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi2012-02-062-12/+12
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Handle inbound buffering in LLCP connectionless socketsSunil Jogi2012-01-303-67/+171
* | | | | | | | | | | | | | Fixed rejected receive request in LLCPSunil Jogi2012-01-301-1/+1
* | | | | | | | | | | | | | Fixed wrong callbacks callSunil Jogi2012-01-301-19/+17
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Increase internal LLCP buffers to fit max MIUSunil Jogi2012-01-272-2/+4
* | | | | | | | | | | | | Reset LLCP socket internal variables before next use.Sunil Jogi2012-01-271-0/+6
* | | | | | | | | | | | | 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
| | | | | | | |\
generated by cgit v1.1 at 2024-06-08 09:38:22 +0000