summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
NDEF Type 3 tag reading was not ignoring the padding bytes, which leads to failure of parsing the NDEF data. This patch fix that problem. Bug: 7600630 Change-Id: I45cf1841bdc343503a8a12d622ac8470c3e64ce4
2012-11-27Increase default IsoDep timeout to 1200ms.Martijn Coenen
An increasing number of IsoDep tags in the field requires more than 600ms to respond to initial NDEF commands. To make sure we can detect these tags properly, increase the default timeout for IsoDep to ~1200ms. Bug: 7600632 Change-Id: I690e2c1993b64c0f639423d5cf0c810f56ad1197
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
* commit 'e4d3c945777c912ba71e79ac99cb11190cf8f90a': Add support for target-customized NFC stack configuration
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
* commit 'cbef2c806acfba5b63963844fccfe3fae975d6bd': HCI ANY_OPEN_PIPE on identity management gate crash fix
2012-08-29am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton
* commit '1985108ceba65f0b01d5c4c41da49073c5d01230': Support of topaz tag NFC Forum version number 1.1
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
This patch allows inclusion of target-customized configuration of NFC stack. The target-specific configuration will be stored in a header file, outside of AOSP. To have it icluded, define TARGET_HAS_NFC_CUSTOM_CONFIG macro and export your header file using BUILD_COPY_HEADERS macro. Change-Id: Ifa2d08c2ae8860c3f0690a04c517025892bd4c16 Author: Sebastian Niciarz <sebastian.niciarz@intel.com> Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 23071
2012-08-14HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA
Apparently, host identity management gate does not support HCI commands coming from another host (including host controller). This patch fixes a tombstone when receiving an HCI command from another host, but still doesn't have a mechanism to treat the command. Change-Id: Ib72df6bac8f503f2b66998ee6e687ae99c15d17b Author: Dejan Rebraca <dejanx.rebraca@intel.com> Signed-off-by: Dejan Rebraca <dejanx.rebraca@intel.com> Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 42426
2012-08-14Support of topaz tag NFC Forum version number 1.1Dejan REBRACA
The latest version of NFC forum Tag type 1 spec is 1.1. This version number needs to be supported by libnfc to support Topaz tags V1.1 with dynamic content. Version number is part of capability container which resides in segment 1 of EEPROM memory of the tag. For older versions of Tag type 1, NFC device may be backward compatible. Change-Id: Ibbfa720d2e34c2f2612579e368f31f4a5c66b465 Author: Dejan REBRACA <dejanx.rebraca@intel.com> Signed-off-by: Dejan REBRACA <dejanx.rebraca@intel.com> Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 33236
2012-07-17phHal4Nfc_ADD: fix memcpy overlapNick Kralevich
Don't call memcpy when src==dest. It's undefined. When memcpy overlap detection is enabled, this causes the NFC process to crash and burn. Bug: 6826770 Change-Id: I199af98e453953de288964f47248cb59af4deecb
2012-07-17phFriNfc_OvrHal: fix memcpy overlapNick Kralevich
Don't use the API workaround when OvrHal->TranceiveInfo.sRecvData.buffer == pRecvdata->buffer. When memcpy overlap detection is enabled, this causes the NFC process to crash and burn. memcpy is undefined when src=dest. Bug: 6826770 Change-Id: Iebc8f82a4f86d560e764cef2229a7f86fa642783
2012-06-19am b668d06f: Reconcile with jb-releaseThe Android Open Source Project
* commit 'b668d06f9447b613f6e8e65817e12ccd8d2b6225': Revert "Added addr field in response of Jewel command"
2012-06-19Reconcile with jb-releaseThe Android Open Source Project
Change-Id: I8d723033a1d479bd9ef5973cb098b488c54c6c62
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
This reverts commit c0da27e8f303bf459797f90f9f2e67c552ae8c27. Bug: 6666792 Change-Id: Icf6aa84a750d2e4855487a6e46959019a09e4a95
2012-06-14am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen
* commit 'f888888a6278d53192bd00b0665c0d39b3cdb6e0': Revert "Added addr field in response of Jewel command"
2012-06-14am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen
* commit '42fef9f8aa6d0878cb3f2c050c637afa7f8d8abd': Revert "Added addr field in response of Jewel command"
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
This reverts commit c0da27e8f303bf459797f90f9f2e67c552ae8c27. Bug: 6666792 Change-Id: Icf6aa84a750d2e4855487a6e46959019a09e4a95
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 ↵Martijn Coenen
NOT MERGE). * commit '55d095b160d7e11c5061e213ae2e1f365f556745': Remove some logs in case of abort() (DO NOT MERGE).
2012-06-12am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
* commit '144d72d32ae420d5f4b25897a43210f56e287637': Remove some logs in case of abort() (DO NOT MERGE).
2012-06-12Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
This allows us to see more context of HCI timeout crashes. Bug: 6114991 Change-Id: Icfda5d4e15e3ceb471ab24f5cb42001c95e9d034
2012-06-08Remove some logs in case of abort().Martijn Coenen
This allows us to see more context of HCI timeout crashes. Change-Id: I5cf1f829f3d0db5afd8d2c753fba7c3f8ad70365
2012-05-24Reconcile with jb-releaseThe Android Open Source Project
Change-Id: I33ff7dfbaeb2e3d39f3235647a4d87fad0d7c57d
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-23am ba040759: Fix wrong extern variable sizeSunil Jogi
* commit 'ba0407599b6271f47a4e6e6d539522ae5b207287': Fix wrong extern variable size
2012-05-23Fix wrong extern variable sizeSunil Jogi
nxp_nfc_felica_timeout originally uint8_t but current source has uint32_t. Changed to uint8_t to fix the problem. Without fix it overwrite the other global memory region which can create problem in other section of code.
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: Ieee9b73eaf1313ba6307349f72a7d16d980c89d8
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
Copyright (C) 2010 NXP Semiconductors Licensed under APACHE2 Bug: 6299628 Change-Id: Ib94487a81d0041f24dc831dd64819be45c153645 Signed-off-by: Wei Zhong <wzhong@google.com>
2012-04-19Fix T2T makeReadonly.Martijn Coenen
Change-Id: Ie4a87d23034cfdbb3c1db227a7f54c2e1a45c98c
2012-04-18merge in jb-release history after reset to masterThe Android Automerger
2012-04-17Added addr field in response of Jewel commandSunil Jogi
Most of the Jewel command response includes the address which is sent as part of command. The response of Jewel command was missing address field. This patch fix that problem by adding the missing addr field. Bug: 5341397 Change-Id: Icba0b37dd9987bc34c3490fa12ebda51ac25ad1e
2012-04-13Added recovery function when SE wired mode selectedSunil Jogi
Added a recovery function with delay when SE wired mode selected. This function will add extra delay before any abort when SE is in wired mode. This will allow SE to complete any operation and do not power off the SE immediately when wired mode transaction is on going.
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
When readonly is interrupted in between next readonly call make remaining sectors readonly and return true. If all sectors are readonly then call to readonly returns error. Change-Id: Id47a77198b41d69b743f24259849e943954c7a58
2012-04-02Mifare readonly support.Sunil Jogi
This patch requires changes done in following projects submited as patches: 1. packages/apps/Nfc 2. frameworks/base Change-Id: I9036309d82dd897e77f6bc14c30fbde255bf955c
2012-04-02Patch to support MIFARE with SAK 0x01Sunil Jogi
Change-Id: Ifb1389d428855c2eea99390790af13f28571097a
2012-03-21Empty merge of a remote-tracking branchMike Lockwood
Change-Id: I5d578bd35aaacdb4ccbaf15668da38a67abc631c
2012-03-21merge 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-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
Change-Id: I1938f348704f6fabefa6600ecf32ff7d6204d021
2012-03-12merge in jb-release history after reset to masterThe Android Automerger
2012-03-09Replace loge with aloge.Ramanan Rajeswaran
Change-Id: Ie2a90be2152c28029990f5e4db5dffd5928fd030
2012-03-09am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
* commit 'da7d267e855affe83c0bc5958292fe74d6e27d7e': nfc-hal: generalize error handling in Reader thread.
2012-03-09am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
* commit '3f791036276b6f535ad253dd25650fad60c72695': nfc-hal: generalize error handling in Reader thread.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:33:17 +0000