History log of /packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
3714e3430e3f44578d7799d163809ad0a77f7460 19-Aug-2011 Martijn Coenen <maco@google.com> Fix GB<->ICS sharing.

Should throw an IOException() whenever recv() failed. Also
changed recv error return value to be -1, to be more in line with
common sockets.

Change-Id: If65fe9e22c76f0a4558a9a6dedc0662bac038ee8
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.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_NativeLlcpSocket.cpp
15a344d89e0187d669989963c7a918a29b229ae3 14-Jan-2011 Arnaud Ferir <arnaud.ferir@trusted-logic.com> Do not wait for callback if LLCP receive is successful.

The LLCP receive function may return NFCSTATUS_SUCCESS is some data have
already been received. This case should be updated according to the change
in libnfc-nxp.

Change-Id: I21ea159e2ec13f4db6ea53dd0edd2c1b916ea064
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
1878c7b6e2cef1e52138ee3a5588913cc165faa5 17-Dec-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> Removed workaround for native socket creation limitation.

Until now, the NFC native library (libnfc-nxp) had some limitations
on the socket life cycle that made impossible to ensure the local server
socket was listening before the remote client was trying to connect.

The RegisteredSocket class was created to workaround this by enabling
socket creation at the Java layer prior to link establishment. This
solution was not fully satisfactory since there were still some race
conditions.

A fix for these limitations has been submitted in the library project
in a commit named "Allow LLCP socket creation before link establishment"
and this patch takes advantage of it to remove the RegisteredSocket
class and all the associated code.

As a consequence, the socket creation methods have been simplified, the
link activation processes is lighter (no need to recreate native sockets
on link activation).

This patch also includes some cleaning (removed unused variables).

Change-Id: I643509d620105ae7d3ba24ea68eae37f05bc6ef3
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
8ddea174e7436fd35d8440c3e6876ee095af2636 17-Dec-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> Release JNI local references in LLCP sockets.

Change-Id: I691f1568ae83f2483bd6c60489d427cf62b1c9c8
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
9e9aca86a21302c0ea26557b374b74a68f9af40d 30-Nov-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> Fixed error case where dynamic semaphore was not released.

Change-Id: I2db58875daaa85289dcb4fff07c57d736dbc6cfc
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.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_NativeLlcpSocket.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_NativeLlcpSocket.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_NativeLlcpSocket.cpp
93915e1c6fe6d5d16fcebeda610782bf5812c9b4 02-Nov-2010 Nick Pelly <npelly@google.com> Remove timeout support - it was guaranteed to cause deadlock.

sem_timedwait() was unbalanced.

Also remove more dead code, and reduce watchdog timeout from 10 to 5 seconds.

Change-Id: Ica776e4a27905071c1453b2db02f9ffadf6f9461
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
de1770748ed464e23bfee6a9c7e12150a83babaa 02-Nov-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> Fixed LLCP receive function.

The LLCP receive function was failing if data were received prior to the
call the receive request.

Change-Id: I9b43b8df6e337454d3e7bf6b8745a02877dd192c
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.cpp
732a4e2900f6592920bed25b52440620d60e6668 18-Oct-2010 Nick Pelly <npelly@google.com> Fix compiler warnings in libnfc_jni

Change-Id: I0a5e85f17ffd3da334372e6618b7440cc108b32c
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Nfc/jni/com_android_nfc_NativeLlcpSocket.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_NativeLlcpSocket.cpp