Update libnfc_nxp_jni for new NFC API.

Change-Id: I77b123a2bf1aeb958629e93670475c5e7c0563d3
Signed-off-by: Nick Pelly <npelly@google.com>

6 files changed, 5 insertions, 8 deletions

diff --git a/trustedlogic/com_trustedlogic_trustednfc_android_NdefMessage.cpp b/trustedlogic/com_trustedlogic_trustednfc_android_NdefMessage.cpp
index e0bab95..6ddbf7e 100644
--- a/trustedlogic/com_trustedlogic_trustednfc_android_NdefMessage.cpp
+++ b/trustedlogic/com_trustedlogic_trustednfc_android_NdefMessage.cpp
@@ -86,7 +86,7 @@ static jint com_trustedlogic_trustednfc_android_NdefMessage_parseNdefMessage(
 
    /* Build NDEF records array */
    record_cls =
-      e->FindClass("com/trustedlogic/trustednfc/android/NdefRecord");
+      e->FindClass("android/nfc/NdefRecord");
    records_array = e->NewObjectArray((jsize)num_of_records, record_cls,
       NULL);
    if(records_array == NULL)
@@ -157,7 +157,7 @@ static jint com_trustedlogic_trustednfc_android_NdefMessage_parseNdefMessage(
    /* Store built array in our NDEFMessage instance */
    msg_cls = e->GetObjectClass(o);
    mrecords = e->GetFieldID(msg_cls, "mRecords",
-      "[Lcom/trustedlogic/trustednfc/android/NdefRecord;");
+      "[Landroid/nfc/NdefRecord;");
 
    e->SetObjectField(o, mrecords, (jobject)records_array);
 
@@ -185,7 +185,7 @@ static JNINativeMethod gMethods[] =
 int register_com_trustedlogic_trustednfc_android_NdefMessage(JNIEnv *e)
 {
    return jniRegisterNativeMethods(e,
-      "com/trustedlogic/trustednfc/android/NdefMessage",
+      "android/nfc/NdefMessage",
       gMethods, NELEM(gMethods));
 }
 
diff --git a/trustedlogic/com_trustedlogic_trustednfc_android_NdefRecord.cpp b/trustedlogic/com_trustedlogic_trustednfc_android_NdefRecord.cpp
index d237da0..76b5791 100644
--- a/trustedlogic/com_trustedlogic_trustednfc_android_NdefRecord.cpp
+++ b/trustedlogic/com_trustedlogic_trustednfc_android_NdefRecord.cpp
@@ -91,7 +91,7 @@ static JNINativeMethod gMethods[] =
 int register_com_trustedlogic_trustednfc_android_NdefRecord(JNIEnv *e)
 {
    return jniRegisterNativeMethods(e,
-      "com/trustedlogic/trustednfc/android/NdefRecord",
+      "android/nfc/NdefRecord",
       gMethods, NELEM(gMethods));
 }
 
diff --git a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket.cpp b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket.cpp
index 6a52478..b9de119 100644
--- a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket.cpp
+++ b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket.cpp
@@ -224,7 +224,7 @@ static JNINativeMethod gMethods[] =
    {"doSendTo", "(I[B)Z",
       (void *)com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket_doSendTo},
       
-   {"doReceiveFrom", "(I)Lcom/trustedlogic/trustednfc/android/LlcpPacket;",
+   {"doReceiveFrom", "(I)Landroid/nfc/LlcpPacket;",
       (void *)com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket_doReceiveFrom},
       
    {"doClose", "()Z",
diff --git a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeNfcManager.cpp b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeNfcManager.cpp
index dd14ba6..2d1666d 100644
--- a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeNfcManager.cpp
+++ b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeNfcManager.cpp
@@ -2264,4 +2264,3 @@ int register_com_trustedlogic_trustednfc_android_internal_NativeNfcManager(JNIEn
 }
 
 } /* namespace android */
-
diff --git a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeP2pDevice.cpp b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeP2pDevice.cpp
index 143c3a4..51f316a 100644
--- a/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeP2pDevice.cpp
+++ b/trustedlogic/com_trustedlogic_trustednfc_android_internal_NativeP2pDevice.cpp
@@ -423,4 +423,3 @@ int register_com_trustedlogic_trustednfc_android_internal_NativeP2pDevice(JNIEnv
 }
 
 } // namepspace android
-
diff --git a/trustedlogic/trustednfc_jni.cpp b/trustedlogic/trustednfc_jni.cpp
index 2ebd74c..56de361 100644
--- a/trustedlogic/trustednfc_jni.cpp
+++ b/trustedlogic/trustednfc_jni.cpp
@@ -291,4 +291,3 @@ const char* trustednfc_jni_get_status_name(NFCSTATUS status)
 }
 
 } // namespace android
-