summaryrefslogtreecommitdiffstats
path: root/jni/com_android_nfc_NativeP2pDevice.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-061-12/+12
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: If3f714c482c26a9b90cae43dbab6e4ee7f46dcb9
* Merge 3d644e80Jean-Baptiste Queru2011-07-261-0/+5
|\ | | | | | | Change-Id: I8391bb474ecfe80ea9e7f13178fbaccf2cc576e8
| * Prevent SE from being opened while target is in field.Daniel Tomas2011-07-251-0/+5
| | | | | | | | | | | | | | | | | | This fixes an issue where an attempt to open the SE while the NFC Controller is in initiator (reader/writer or P2P Initiator) mode would cause a strange error response, and all further attempts to open the SE fail. Change-Id: I6401f644c73a993433cb73fee2eff8c11ededa1d
* | Relocate the libnfc-nxp Java bridge sources.Jeff Hamilton2011-06-131-1/+1
|/ | | | Change-Id: I0b743245d60bf9c47ce84ec0ab7fd8c5b6202ec9
* Do not disconnect P2P target if connect failed.Arnaud Ferir2011-01-241-1/+5
| | | | | | | | If the P2P target connect failed, the P2P target disconnect cannot be done. However the polling loop must be restarted. This is already done in JNI layer by the failing connect itself. Change-Id: I1c3323e4c038c8133e7b6e16b3a238c050427cfc
* Fix in P2P disconnect and in GetStackCapabilitiesdaniel_Tomas2010-11-241-1/+10
| | | | Change-Id: I444b0d243d82b3002d6c41bb1405561368c7a52c
* Use dynamic semaphores in JNI layer.Sylvain Fonteneau2010-11-221-66/+125
| | | | Change-Id: Iee394ace642302ee269e73203d3fc8427c69047e
* Quiet most logs in NFC by default.Jeff Hamilton2010-11-031-22/+19
| | | | | | Bug: 3124915 Change-Id: If5a3e6b21fe43d9ce2ff82ee65751baaa1c0e0a2 Signed-off-by: Nick Pelly <npelly@google.com>
* Removed presence checking when disconnectin in P2P mode.Sylvain Fonteneau2010-11-031-19/+4
| | | | | | | | | | | With LLCP, the disconnection is called only when the remote peer is already lost, so we do not need to check again at that point. This also avoids calling the presence check function while a transceive operation may be pending. Change-Id: Id8a5e83f4aa20a7cabac1e4ce6e7ce59ab49e28b Signed-off-by: Nick Pelly <npelly@google.com>
* Use malloc to allocate semaphores for easier memory corruption detection.Nick Pelly2010-11-021-14/+15
| | | | | Change-Id: I9741b2527914992ab710c405d869f0ac6273f468 Signed-off-by: Nick Pelly <npelly@google.com>
* Patch for semaphore managnement with wrong return code from the LibnfcDaniel Tomas2010-11-021-99/+107
| | | | Change-Id: I909b2623f66ca0f3f0370617e2df4b1075614c44
* CONCURRENCY_LOCK() cleanup.Nick Pelly2010-11-021-2/+2
| | | | | | | | | Rename functions that need to be called with lock held to _locked(). Remove dead code. Replace asyncDisconnect() with disconnect() - its broken. Change-Id: I04feb449394750954e202223366a0fa5ea425924 Signed-off-by: Nick Pelly <npelly@google.com>
* Patch from NXP. Avoid overrun when setting timer.Jeff Hamilton2010-10-271-0/+2
| | | | Change-Id: I9f46908d99d05804cd325024fc60da762f5beb1d
* Rename com_trustedlogic_trustednfc -> com_android_nfc.Nick Pelly2010-10-171-0/+420
Change-Id: I7299115be35b4a598ad9bfc068d6161a01d1a834 Signed-off-by: Nick Pelly <npelly@google.com>