summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | | | | Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Added recovery function when SE wired mode selected"Martijn Coenen2012-04-203-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added recovery function when SE wired mode selectedSunil Jogi2012-04-133-0/+19
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong2012-04-192-0/+189
* | | | | | | | | | | | | | | | | | | | Fix T2T makeReadonly.Martijn Coenen2012-04-191-1/+1
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Added addr field in response of Jewel commandSunil Jogi2012-04-171-0/+63
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi2012-04-023-14/+16
* | | | | | | | | | | | | | | | | | Mifare readonly support.Sunil Jogi2012-04-027-22/+455
* | | | | | | | | | | | | | | | | | Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-025-4/+9
* | | | | | | | | | | | | | | | | | Empty merge of a remote-tracking branchMike Lockwood2012-03-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | DO NOT MERGEMike J. Chen2012-02-071-0/+5
| * | | | | | | | | | | | | | | | | am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-076-114/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am b13b27aa: Use a 10s timeout in uart_read() in FW download mode.Nick Pelly2011-10-262-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaroun...Martijn Coenen2011-10-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | Don't dump nfc target/initiator modes to system log.Martijn Coenen2012-03-161-2/+2
| |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Replace loge with aloge.Ramanan Rajeswaran2012-03-091-1/+1
* | | | | | | | | | | | | | | | | | | | am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
* | | | | | | | | | | | | | | | | | | | | am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary va...Nick Pelly2012-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 65ce3454: Merge "Fix one coding error of using a temporary variable in the...Nick Pelly2012-03-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix one coding error of using a temporary variable in the global struc...Nick Pelly2012-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Fix one coding error of using a temporary variable in the global structure Nd...Jack Ren2012-03-011-1/+1
| | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Support for handling of proprietry TLV in T4TSunil Jogi2012-03-051-1/+1
* | | | | | | | | | | | | | | | | | | | | Skip proprietry TLV for Type 2Sunil Jogi2012-03-051-1/+3
| |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | (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
| |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |