LLCP 1.1 support.

- Allow servicename for connectionless sockets;
- Pass in servicename in Bind() for both types;
- EchoServer: allow MIU=128 again since ATR_RES
    fix was merged in libnfc-nxp
- EchoServer: fix reading from incorrect offset.

Change-Id: Ie77fe5b46e7a17435e6261c8b7400dcca4d3784a

1 files changed, 4 insertions, 1 deletions

diff --git a/jni/com_android_nfc_NativeLlcpSocket.cpp b/jni/com_android_nfc_NativeLlcpSocket.cpp
index 046ef6a..0c0b830 100644
--- a/jni/com_android_nfc_NativeLlcpSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpSocket.cpp
@@ -167,7 +167,7 @@ static jboolean com_android_nfc_NativeLlcpSocket_doConnectBy(JNIEnv *e, jobject
 {
    NFCSTATUS ret;
    struct timespec ts;
-   phNfc_sData_t serviceName;
+   phNfc_sData_t serviceName = {0};
    phLibNfc_Handle hRemoteDevice;
    phLibNfc_Handle hLlcpSocket;
    struct nfc_jni_callback_data cb_data;
@@ -217,6 +217,9 @@ static jboolean com_android_nfc_NativeLlcpSocket_doConnectBy(JNIEnv *e, jobject
    result = JNI_TRUE;
 
 clean_and_return:
+   if (serviceName.buffer != NULL) {
+      e->ReleaseStringUTFChars(sn, (const char *)serviceName.buffer);
+   }
    nfc_cb_data_deinit(&cb_data);
    return result;
 }