| 742eacb628af1f2e008c76462cca3c651a6433b7 |
|
26-Jul-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Merge 3d644e80
Change-Id: I8391bb474ecfe80ea9e7f13178fbaccf2cc576e8
|
| 04a29c85c9bdbf0b25171332013934c3436ab0ec |
|
22-Jul-2011 |
Daniel Tomas <dtomas.nxp@gmail.com> |
Prevent SE from being opened while target is in field.
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
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| 81c476dd93f059d4082c15369894d5d16fbea05d |
|
14-Jun-2011 |
Jeff Hamilton <jham@android.com> |
Relocate the libnfc-nxp Java bridge sources.
Change-Id: I0b743245d60bf9c47ce84ec0ab7fd8c5b6202ec9
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| 7f5487be0414b1f92b41cc5f7b0b7db846d9b1c9 |
|
19-Jan-2011 |
Arnaud Ferir <arnaud.ferir@trusted-logic.com> |
Do not disconnect P2P target if connect failed.
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
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| b7e9e916ae7fae6ccb02bf0d2b2dd4b736f48f5e |
|
23-Nov-2010 |
daniel_Tomas <daniel.tomas@trusted-logic.com> |
Fix in P2P disconnect and in GetStackCapabilities
Change-Id: I444b0d243d82b3002d6c41bb1405561368c7a52c
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| b78172c6c46957cc37786b690db9bc854b26b7f9 |
|
16-Nov-2010 |
Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> |
Use dynamic semaphores in JNI layer.
Change-Id: Iee394ace642302ee269e73203d3fc8427c69047e
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| ef92efa7fd86d75cc35465b84e8740f941ff0f0a |
|
04-Nov-2010 |
Jeff Hamilton <jham@android.com> |
Quiet most logs in NFC by default.
Bug: 3124915
Change-Id: If5a3e6b21fe43d9ce2ff82ee65751baaa1c0e0a2
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| ee11d5a08f23117381a81f84bcdbf9b1fe2f1909 |
|
03-Nov-2010 |
Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> |
Removed presence checking when disconnectin in P2P mode.
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>
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| d6d37f92a925d986a1abf9c296e4f67a0403e354 |
|
03-Nov-2010 |
Nick Pelly <npelly@google.com> |
Use malloc to allocate semaphores for easier memory corruption detection.
Change-Id: I9741b2527914992ab710c405d869f0ac6273f468
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| 48819102064977c3e37e18fd6db9a6022c01300c |
|
02-Nov-2010 |
Daniel Tomas <daniel.tomas@trusted-logic.com> |
Patch for semaphore managnement with wrong return code from the Libnfc
Change-Id: I909b2623f66ca0f3f0370617e2df4b1075614c44
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| 21545af22f9b913ec9cb124287aab2fcb0cf2b3b |
|
02-Nov-2010 |
Nick Pelly <npelly@google.com> |
CONCURRENCY_LOCK() cleanup.
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>
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| eead88c5e2bdd34eb33fdf2c76717f9edb9e0396 |
|
27-Oct-2010 |
Jeff Hamilton <jham@android.com> |
Patch from NXP. Avoid overrun when setting timer.
Change-Id: I9f46908d99d05804cd325024fc60da762f5beb1d
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|
| c2fdb614879c601b5162d5d93d705b05c7b1e072 |
|
18-Oct-2010 |
Nick Pelly <npelly@google.com> |
Rename com_trustedlogic_trustednfc -> com_android_nfc.
Change-Id: I7299115be35b4a598ad9bfc068d6161a01d1a834
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Nfc/jni/com_android_nfc_NativeP2pDevice.cpp
|