summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-07am 65ce3454: Merge "Fix one coding error of using a temporary variable in ↵Nick Pelly
the global structure NdefMap" * commit '65ce34545ca9a1b77b54acd373618821d8123ef8': Fix one coding error of using a temporary variable in the global structure NdefMap
2012-03-07Merge "Fix one coding error of using a temporary variable in the global ↵android-sdk-adt_r20tools_r20ics-plus-aospNick Pelly
structure NdefMap"
2012-03-06merge in jb-release history after reset to masterThe Android Automerger
2012-03-05Support for handling of proprietry TLV in T4TSunil Jogi
If CC file is including proprietory TLV then Check NDEF was returning tag is not NDEF compilant. This patch fix that problem. Change-Id: I28e7701c7d6e78de8b19b93d09789c09fa9357bd
2012-03-05Skip proprietry TLV for Type 2Sunil Jogi
Skipping proprietry TLV for Type 2 reading if it is present. Earlier Type 2 tag was not detected as NDEF tag is proprietry TLV present. Change-Id: Ia3ca722790f4a990fe976617aecbbdf6a7d53570
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 ↵Jack Ren
NdefMap In the following code: the local variable PacketDataLength is a local variable in stack, but used in the ndefMap which is a global structure. When the function phFriNfc_NdefMap_EraseNdef( ) returns, the PacketDataLength will be freed, too. If it is used later via the pointer in NdefMap, will cause some of potential issues. Fix it by re-define it as static. NFCSTATUS phFriNfc_NdefMap_EraseNdef(phFriNfc_NdefMap_t *NdefMap) { NFCSTATUS status = NFCSTATUS_PENDING; static uint8_t PktData[3] = PH_FRINFC_NDEFMAP_EMPTY_NDEF_MSG; uint8_t MemOffset = PH_FRINFC_NDEFMAP_SEEK_BEGIN; uint32_t PacketDataLength = sizeof(PktData); ... /* Mifare card selected. Call Mifare Write */ status = phFriNfc_NdefMap_WrNdef( NdefMap, PktData, &PacketDataLength, MemOffset); break; ... } Change-Id: Iee278fe39749619aa44c620138eae85a46f6e4a5 Signed-off-by: Dejan REBRACA <dejanx.rebraca@intel.com> Signed-off-by: Ken Wahid <kenx.wahid@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-02-17(DEBUG) Add support for setting p2p modes.Martijn Coenen
Change-Id: Ic6df1fc458cef2531119e5e5e2ef5f9a7b21a524
2012-02-07DO NOT MERGEMike J. Chen
Disable NXP_SMX (secure element) in libnfc-nxp for Phantasm Phantasm uses a PN544, which has no secure element. libnfc-nxp is configured to assume a secure element currently and doesn't handle runtime detection properly. The result is that on first boot, when the NfcService tries to wipe the secure element, it hangs as it tries to open a connection to the non-existing secure element. Changing the define to NXP_SMX=0 makes the library report no secure element, and the wipe operation fails (like it should) when it tries to do the wipe. This fixes Bug: 5964890 Will file a separate bug to have the library and Nfc.apk do better at runtime detection of the secure element. This shouldn't go back to master since it's a target specific change. Change-Id: Id6e57b7f5a88e96a59b9cdc6f67ac966fa964356 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-02-07merge in jb-release history after reset to masterThe Android Automerger
2012-02-06Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen
LLCP state was not reset properly. Bug: 5971895 Change-Id: I4fda6ef7c78ae2730359cf5c90d887d205e57799
2012-02-06Merge "Fixed FRMR sending on invalid LLCP frame received"Martijn Coenen
2012-02-06Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi
DSAP and SSAP were switched on with the other at multiple location in the code. This patch fix those. Change-Id: Iea8e499049a2cd4a234155a3044b875eb9c6ca7a
2012-02-01am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '700428d8f73604f27f4416fd14d3ef1cb86fca9e':
2012-02-01am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '8c56cd9e0bc2808d73e6596ba3bb128cc2fbcd7c':
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: Iee6e204b8a44a1efb75dea184cc1a69baac91f06
2012-01-31merge in jb-release history after reset to masterThe Android Automerger
2012-01-30Handle inbound buffering in LLCP connectionless socketsSunil Jogi
This enables the server to avoid losing packets, especially when receiving them in an aggregated packet. The size of the buffer is determined by the size of the working buffer provided by the application. Change-Id: Ia3c72e19fdb74e2a43390af5607c497c2275fe46
2012-01-30Fixed rejected receive request in LLCPSunil Jogi
If phLibNfc_Llcp_Recv() is called in the callback of a previous phLibNfc_Llcp_Recv(), it could be rejected due to the bSocketRecvPending flag which was not properly reset. Change-Id: I6c41469480b50bb7adc9a721ec96f715e5d56a60
2012-01-30Fixed wrong callbacks callSunil Jogi
Call the callback only if the context is not null. Change-Id: I783d9e8ddedb2546eff85837826703db189f9f59
2012-01-30merge in jb-release history after reset to masterThe Android Automerger
2012-01-27Increase internal LLCP buffers to fit max MIUSunil Jogi
Interal buffer increased to 2178 = 3 (max LLCP header size) + 128 (default MIU) + 2047 (max MIU) Change-Id: I3cc2ff705e74ae657d93b5e50a577b0e7e5ebfcf
2012-01-27Reset LLCP socket internal variables before next use.Sunil Jogi
Some internal variables used in reveive window checkings were not reset on socket closure/re-opening. This was leading to have the send() function waiting forever for remote acknowledgments. Change-Id: Ic7741b004de80af3f851f620842d46c42f654804
2012-01-27Update for LLCP V(SA) internal variableSunil Jogi
The V(SA) is an internal variable used in LLCP connection-oriented data links to check receive window conditions. It corresponds to the last frame number acknowledged by remote peer + 1. The patch makes sure this variable is updated evry time it is needed. Change-Id: Ie5ac925a6f1dfa19b22ac2b6e96659440d5daf21
2012-01-27LLCP 1.1: Fix some bugs.Martijn Coenen
- Clear out send callback if send was not accepted. - Set transport busy status for RR/RNR frames. Change-Id: Idf8986f6b82995644b176247a644e36d2c879ebf
2012-01-27Adding support for handling maximum length supported by peerSunil Jogi
Support for chaining is added based on maximum length supported by and passed in ATS by peer and maximum length supported by the device. Change-Id: I8f9f8468ff8ac9d3579bc8b6afbe3e2072e56de8
2012-01-27LLCP 1.1 implementation.Sunil Jogi
Previously, in LLCP v1.0, the only way to use the SDP (Service Discovery Protocol) service was to send a CONNECT frame containing the Service Name to the SDP service. This was implicitly preforming a connection request to the requested service. LLCP v1.1 introduced a way to discover services more efficiently and without implicit connection. It also enables connectionless services to have a service name. It is based on a new protocol based on a new SNL frame containing discovery requests and responses. This update comes with new APIs: - phLibNfc_Llcp_DiscoverServices() function can be used to discover remote services. It can take multiple service names and resolve all of them in a single call. - Register service name at bind time. Cache LLCP service name/sap pairs. In LLCP 1.1 specification defines at section 5.9 that any service lookup answer must be valid for the whole LLCP session duration. To enforce this, we cache the SAP/SN pairs locally and make sure that the applications don't break the cache. The stack remains fully retro-compatible with v1.0 devices. Change-Id: I052edd3838013cee65e7415d0ed01fc3e9cad36d
2012-01-27LLCP 1.1: allow pending operations on connectionless.Sunil Jogi
The pending operations were handled at the connection-oriented sockets level, with no possibility for other transport types to handle pending operations. A dispatcher has been added at the generic transport level to remove this limitation. This feature is needed to implement LLCP v1.1. Change-Id: I69e37ba800d1c531396ca97ab0a0480e0f53d63f
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
This fixes one of the crashes occuring when turning the screen off during p2p transfers. One remaining. Change-Id: I3e45be9b8f4be40350ba4dd9db7e596631206bd1
2012-01-20Clear out send/recv callbacks for connectionless sockets.Martijn Coenen
When a connectionless socket is closed, Connectionless_Abort() is called, which in turn calls the send and receive callbacks to indicate abortion. But since these callbacks are not cleared out after a previous send/receive has completed, this can lead to spurious callbacks and consequently memory corruption. Change-Id: Iea7a34829c4db1cae3b49f33117b25b50205683f
2012-01-17merge in ics-release history after reset to masterThe Android Automerger
2012-01-13Prevent LLCP stack from deactiving twice.Martijn Coenen
Some parts of the code reset the state to an operation state, even if the link has already been shutdown. This allowed for a second deactivation callback, causing a crash higher up in the stack. Bug: 5765077 Change-Id: I2f2ac720756353d45d82634d27a3dd9acecae43d
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
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I935ee4450e2e62ced1537bafb787ad402cfcb69c
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I05dd3a5e5f671c0fdc17bf4e3d52395ccdb56e45
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
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: Ie5dac4fad8942433d2b8fe3c0539e4c3c678a082
2011-12-09am 593d6d4a: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '593d6d4a79601c530825ce9a52fd3f4cf03e1b6f':
2011-12-08Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: If89fd19c4cd2215ee43c5ef1dbd151c049d940d2
2011-11-10Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: Iaf498cf86a8995a7c51b3b88c3b1acebdf0185b7
2011-11-08merge in ics-release history after reset to masterThe Android Automerger
2011-11-08merge in ics-mr1-release history after reset to ics-mr1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1ics-mr1-releaseThe Android Automerger
2011-11-07am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen
* commit 'b99be65c277b0cc65a00a33e784ed49461531737': Use NFC HAL for some libnfc settings.
2011-11-07am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen
* commit 'b99be65c277b0cc65a00a33e784ed49461531737': Use NFC HAL for some libnfc settings.
2011-11-03Use NFC HAL for some libnfc settings.android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1ics-mr1Martijn Coenen
The NFC HAL in libhardware allows us to store and retrieve product-specific settings. This patch moves two product-specific settings to the HAL: the device port, and the usage of the i2c workaround we had for crespo. This means configuring the port no longer needs to be done from JNI land. Change-Id: I2e19b6f188f808bc2f2a1f1abc28f2a6c47e6a4c
2011-10-31Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: I1f8bab351bcf7e2e90623aae71c725a123144440
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 12:33:22 +0000