summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-06-14Revert "Added addr field in response of Jewel command"android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1M8974AAAAANLYA0000036M8960AAAAANLYA2205M8960AAAAANLYA2003M8960AAAAANLYA1723JM8960AAAAANLYA1074JM8960AAAAANLYA10741JM8960AAAAANLYA100713PM8960AAAAANLYA100713OM8960AAAAANLYA100713NM8960AAAAANLYA100713MM8960AAAAANLYA100713LM8960AAAAANLYA100713KM8960AAAAANLYA100713JM8930AAAAANLYA2002018M8930AAAAANLYA1030JM8930AAAAANLYA1021JM8625SSNSKMLYA1215M8625SSNSKMLYA1210M8260AAABQNLZA313035M8260AAABQNLZA313030M8260AAABQNLZA223010M76XXUSNEKNLYA2515M76XXUSNEKNLYA2510M7630AABBQMLZA40701010M7630AABBQMLZA40701000A8064AAAAANLYA1312A8064AAAAANLYA101013A8064AAAAANLYA101012A8064AAAAANLYA101011jb_chocolateaosp-new/jb-releaseaosp-new/jb-mr0-releaseMartijn Coenen1-63/+0
2012-06-13merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-06-12Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen1-4/+2
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-23Fix wrong extern variable sizeSunil Jogi1-1/+1
2012-04-23merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-20Merge "Added recovery function when SE wired mode selected"Martijn Coenen3-0/+19
2012-04-19Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong2-0/+189
2012-04-19Fix T2T makeReadonly.Martijn Coenen1-1/+1
2012-04-18merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-17Added addr field in response of Jewel commandSunil Jogi1-0/+63
2012-04-13Added recovery function when SE wired mode selectedSunil Jogi3-0/+19
2012-04-09merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-02Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi3-14/+16
2012-04-02Mifare readonly support.Sunil Jogi7-22/+455
2012-04-02Patch to support MIFARE with SAK 0x01Sunil Jogi5-4/+9
2012-03-21Empty merge of a remote-tracking branchMike Lockwood0-0/+0
2012-03-21merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-20merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-20merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-16Don't dump nfc target/initiator modes to system log.Martijn Coenen1-2/+2
2012-03-12merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-09Replace loge with aloge.Ramanan Rajeswaran1-1/+1
2012-03-09am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal1-5/+16
2012-03-09am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal1-5/+16
2012-03-09nfc-hal: generalize error handling in Reader thread.Rakesh Goyal1-5/+16
2012-03-08merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-07am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary va...Nick Pelly1-1/+1
2012-03-07am 65ce3454: Merge "Fix one coding error of using a temporary variable in the...Nick Pelly1-1/+1
2012-03-07Merge "Fix one coding error of using a temporary variable in the global struc...android-sdk-adt_r20aosp-new/tools_r20aosp-new/ics-plus-aospNick Pelly1-1/+1
2012-03-06merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-05Support for handling of proprietry TLV in T4TSunil Jogi1-1/+1
2012-03-05Skip proprietry TLV for Type 2Sunil Jogi1-1/+3
2012-03-05merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-01Fix one coding error of using a temporary variable in the global structure Nd...Jack Ren1-1/+1
2012-02-17(DEBUG) Add support for setting p2p modes.Martijn Coenen4-3/+33
2012-02-07DO NOT MERGEMike J. Chen1-0/+5
2012-02-07merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-02-06Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen1-2/+3
2012-02-06Merge "Fixed FRMR sending on invalid LLCP frame received"Martijn Coenen2-12/+12
2012-02-06Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi2-12/+12
2012-02-01am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project0-0/+0
2012-02-01am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project0-0/+0
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project0-0/+0
2012-01-31merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-01-30Handle inbound buffering in LLCP connectionless socketsSunil Jogi3-67/+171
2012-01-30Fixed rejected receive request in LLCPSunil Jogi1-1/+1
2012-01-30Fixed wrong callbacks callSunil Jogi1-19/+17
2012-01-30merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-01-27Increase internal LLCP buffers to fit max MIUSunil Jogi2-2/+4