summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-04-25Return NFCSTATUS_BUSY in case of invalid state transition.android-4.4_r0.7android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devMartijn Coenen
2013-04-12Restore SE activated mode in case of failure.Martijn Coenen
2013-04-09Add liblogYing Wang
2013-03-06Make sure LLCP header fields are reset.Martijn Coenen
2013-03-05Fix wrong callback being cleared.Martijn Coenen
2013-03-05Fix some LLCP threading issues.Martijn Coenen
2013-02-28Immediately bounce back SYMM packet when initiator.Martijn Coenen
2012-11-28Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-devandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devMartijn Coenen
2012-11-27NDEF Type 3 tag reading with padding bytesSunil Jogi
2012-11-27Increase default IsoDep timeout to 1200ms.Martijn Coenen
2012-08-30am e4d3c945: Merge "Add support for target-customized NFC stack configuration"android-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devMartijn Coenen
2012-08-30Merge "Add support for target-customized NFC stack configuration"tools_r21Martijn Coenen
2012-08-29am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton
2012-08-29am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton
2012-08-29Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton
2012-08-29Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton
2012-08-23Add support for target-customized NFC stack configurationSebastian Niciarz
2012-08-14HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA
2012-08-14Support of topaz tag NFC Forum version number 1.1Dejan REBRACA
2012-07-17phHal4Nfc_ADD: fix memcpy overlapNick Kralevich
2012-07-17phFriNfc_OvrHal: fix memcpy overlapNick Kralevich
2012-06-19am b668d06f: Reconcile with jb-releaseThe Android Open Source Project
2012-06-19Reconcile with jb-releaseThe Android Open Source Project
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_r1jb-releasejb-mr0-releaseMartijn Coenen
2012-06-14am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen
2012-06-14am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen
2012-06-14Revert "Added addr field in response of Jewel command"android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devMartijn Coenen
2012-06-13merge in jb-release history after reset to jb-devThe Android Automerger
2012-06-12am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO N...Martijn Coenen
2012-06-12am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
2012-06-12Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
2012-06-08Remove some logs in case of abort().Martijn Coenen
2012-05-24Reconcile with jb-releaseThe Android Open Source Project
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-23am ba040759: Fix wrong extern variable sizeSunil Jogi
2012-05-23Fix wrong extern variable sizeSunil Jogi
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
2012-04-23merge in jb-release history after reset to masterThe Android Automerger
2012-04-20Merge "Added recovery function when SE wired mode selected"Martijn Coenen
2012-04-19Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong
2012-04-19Fix T2T makeReadonly.Martijn Coenen
2012-04-18merge in jb-release history after reset to masterThe Android Automerger
2012-04-17Added addr field in response of Jewel commandSunil Jogi
2012-04-13Added recovery function when SE wired mode selectedSunil Jogi
2012-04-09merge in jb-release history after reset to masterThe Android Automerger
2012-04-02Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi
2012-04-02Mifare readonly support.Sunil Jogi
2012-04-02Patch to support MIFARE with SAK 0x01Sunil Jogi
2012-03-21Empty merge of a remote-tracking branchMike Lockwood
2012-03-21merge in jb-release history after reset to masterThe Android Automerger