summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-03-20merge in jb-release history after reset to masterThe Android Automerger
2012-03-20merge in jb-release history after reset to masterThe Android Automerger
2012-03-16Don't dump nfc target/initiator modes to system log.Martijn Coenen
2012-03-12merge in jb-release history after reset to masterThe Android Automerger
2012-03-09Replace loge with aloge.Ramanan Rajeswaran
2012-03-09am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-09am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-09nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-08merge in jb-release history after reset to masterThe Android Automerger
2012-03-07am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary va...Nick Pelly
2012-03-07am 65ce3454: Merge "Fix one coding error of using a temporary variable in the...Nick Pelly
2012-03-07Merge "Fix one coding error of using a temporary variable in the global struc...android-sdk-adt_r20tools_r20ics-plus-aospNick Pelly
2012-03-06merge in jb-release history after reset to masterThe Android Automerger
2012-03-05Support for handling of proprietry TLV in T4TSunil Jogi
2012-03-05Skip proprietry TLV for Type 2Sunil Jogi
2012-03-05merge in jb-release history after reset to masterThe Android Automerger
2012-03-01Fix one coding error of using a temporary variable in the global structure Nd...Jack Ren
2012-02-17(DEBUG) Add support for setting p2p modes.Martijn Coenen
2012-02-07DO NOT MERGEMike J. Chen
2012-02-07merge in jb-release history after reset to masterThe Android Automerger
2012-02-06Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen
2012-02-06Merge "Fixed FRMR sending on invalid LLCP frame received"Martijn Coenen
2012-02-06Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi
2012-02-01am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-01-31merge in jb-release history after reset to masterThe Android Automerger
2012-01-30Handle inbound buffering in LLCP connectionless socketsSunil Jogi
2012-01-30Fixed rejected receive request in LLCPSunil Jogi
2012-01-30Fixed wrong callbacks callSunil Jogi
2012-01-30merge in jb-release history after reset to masterThe Android Automerger
2012-01-27Increase internal LLCP buffers to fit max MIUSunil Jogi
2012-01-27Reset LLCP socket internal variables before next use.Sunil Jogi
2012-01-27Update for LLCP V(SA) internal variableSunil Jogi
2012-01-27LLCP 1.1: Fix some bugs.Martijn Coenen
2012-01-27Adding support for handling maximum length supported by peerSunil Jogi
2012-01-27LLCP 1.1 implementation.Sunil Jogi
2012-01-27LLCP 1.1: allow pending operations on connectionless.Sunil Jogi
2012-01-25merge in ics-release history after reset to masterThe Android Automerger
2012-01-23merge in ics-release history after reset to masterThe Android Automerger
2012-01-20Don't overwrite psUpperLayerContext when reconfiguring the SE.Martijn Coenen
2012-01-20Clear out send/recv callbacks for connectionless sockets.Martijn Coenen
2012-01-17merge in ics-release history after reset to masterThe Android Automerger
2012-01-13Prevent LLCP stack from deactiving twice.Martijn Coenen
2012-01-10merge in ics-release history after reset to masterThe Android Automerger
2012-01-09merge in ics-release history after reset to masterThe Android Automerger
2012-01-06Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
2012-01-05merge in ics-release history after reset to masterThe Android Automerger
2012-01-03Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block