From 642ab20c81425ba93e206d2a30602cd67ae8bd38 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Wed, 25 Jul 2012 13:30:11 -0700 Subject: Point jni class references to new dhimpl package. The DeviceHost classed moved to a new package, updated the JNI references accordingly. Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5 --- ..._android_nfc_NativeLlcpConnectionlessSocket.cpp | 2 +- .../com_android_nfc_NativeLlcpServiceSocket.cpp | 6 +++--- nxp/jni/com_android_nfc_NativeLlcpSocket.cpp | 2 +- nxp/jni/com_android_nfc_NativeNfcManager.cpp | 24 +++++++++++----------- nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp | 2 +- nxp/jni/com_android_nfc_NativeNfcTag.cpp | 2 +- nxp/jni/com_android_nfc_NativeP2pDevice.cpp | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'nxp') diff --git a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp index 188edb4..86607b5 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp @@ -246,7 +246,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeLlcpConnectionlessSocket(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeLlcpConnectionlessSocket", + "com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket", gMethods, NELEM(gMethods)); } diff --git a/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp index 92de3e4..2fccfc9 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp @@ -139,7 +139,7 @@ static jobject com_NativeLlcpServiceSocket_doAccept(JNIEnv *e, jobject o, jint m } /* Create new LlcpSocket object */ - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeLlcpSocket",&(clientSocket)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeLlcpSocket",&(clientSocket)) == -1) { ALOGD("LLCP Socket creation error"); goto clean_and_return; @@ -209,7 +209,7 @@ static jboolean com_NativeLlcpServiceSocket_doClose(JNIEnv *e, jobject o) */ static JNINativeMethod gMethods[] = { - {"doAccept", "(III)Lcom/android/nfc/nxp/NativeLlcpSocket;", + {"doAccept", "(III)Lcom/android/nfc/dhimpl/NativeLlcpSocket;", (void *)com_NativeLlcpServiceSocket_doAccept}, {"doClose", "()Z", @@ -220,7 +220,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeLlcpServiceSocket(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeLlcpServiceSocket", + "com/android/nfc/dhimpl/NativeLlcpServiceSocket", gMethods, NELEM(gMethods)); } diff --git a/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp index 0c0b830..91a72a5 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp @@ -462,7 +462,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeLlcpSocket(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeLlcpSocket",gMethods, NELEM(gMethods)); + "com/android/nfc/dhimpl/NativeLlcpSocket",gMethods, NELEM(gMethods)); } } // namespace android diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp index e6da0fa..d82291b 100644 --- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp @@ -1644,16 +1644,16 @@ static jboolean com_android_nfc_NfcManager_init_native_struc(JNIEnv *e, jobject /* Initialize native cached references */ cached_NfcManager_notifyNdefMessageListeners = e->GetMethodID(cls, - "notifyNdefMessageListeners","(Lcom/android/nfc/nxp/NativeNfcTag;)V"); + "notifyNdefMessageListeners","(Lcom/android/nfc/dhimpl/NativeNfcTag;)V"); cached_NfcManager_notifyTransactionListeners = e->GetMethodID(cls, "notifyTransactionListeners", "([B)V"); cached_NfcManager_notifyLlcpLinkActivation = e->GetMethodID(cls, - "notifyLlcpLinkActivation","(Lcom/android/nfc/nxp/NativeP2pDevice;)V"); + "notifyLlcpLinkActivation","(Lcom/android/nfc/dhimpl/NativeP2pDevice;)V"); cached_NfcManager_notifyLlcpLinkDeactivated = e->GetMethodID(cls, - "notifyLlcpLinkDeactivated","(Lcom/android/nfc/nxp/NativeP2pDevice;)V"); + "notifyLlcpLinkDeactivated","(Lcom/android/nfc/dhimpl/NativeP2pDevice;)V"); cached_NfcManager_notifyTargetDeselected = e->GetMethodID(cls, "notifyTargetDeselected","()V"); @@ -1673,13 +1673,13 @@ static jboolean com_android_nfc_NfcManager_init_native_struc(JNIEnv *e, jobject cached_NfcManager_notifySeEmvCardRemoval = e->GetMethodID(cls, "notifySeEmvCardRemoval", "()V"); - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeNfcTag",&(nat->cached_NfcTag)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeNfcTag",&(nat->cached_NfcTag)) == -1) { ALOGD("Native Structure initialization failed"); return FALSE; } - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeP2pDevice",&(nat->cached_P2pDevice)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeP2pDevice",&(nat->cached_P2pDevice)) == -1) { ALOGD("Native Structure initialization failed"); return FALSE; @@ -2105,7 +2105,7 @@ static jobject com_android_nfc_NfcManager_doCreateLlcpConnectionlessSocket(JNIEn /* Create new NativeLlcpConnectionlessSocket object */ - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeLlcpConnectionlessSocket",&(connectionlessSocket)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket",&(connectionlessSocket)) == -1) { goto error; } @@ -2232,7 +2232,7 @@ static jobject com_android_nfc_NfcManager_doCreateLlcpServiceSocket(JNIEnv *e, j TRACE("phLibNfc_Llcp_Listen() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret)); /* Create new NativeLlcpServiceSocket object */ - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeLlcpServiceSocket",&(serviceSocket)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeLlcpServiceSocket",&(serviceSocket)) == -1) { ALOGE("Llcp Socket object creation error"); goto error; @@ -2316,7 +2316,7 @@ static jobject com_android_nfc_NfcManager_doCreateLlcpSocket(JNIEnv *e, jobject TRACE("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret)); /* Create new NativeLlcpSocket object */ - if(nfc_jni_cache_object(e,"com/android/nfc/nxp/NativeLlcpSocket",&(clientSocket)) == -1) + if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeLlcpSocket",&(clientSocket)) == -1) { ALOGE("Llcp socket object creation error"); return NULL; @@ -2566,13 +2566,13 @@ static JNINativeMethod gMethods[] = {"doActivateLlcp", "()Z", (void *)com_android_nfc_NfcManager_doActivateLlcp}, - {"doCreateLlcpConnectionlessSocket", "(ILjava/lang/String;)Lcom/android/nfc/nxp/NativeLlcpConnectionlessSocket;", + {"doCreateLlcpConnectionlessSocket", "(ILjava/lang/String;)Lcom/android/nfc/dhimpl/NativeLlcpConnectionlessSocket;", (void *)com_android_nfc_NfcManager_doCreateLlcpConnectionlessSocket}, - {"doCreateLlcpServiceSocket", "(ILjava/lang/String;III)Lcom/android/nfc/nxp/NativeLlcpServiceSocket;", + {"doCreateLlcpServiceSocket", "(ILjava/lang/String;III)Lcom/android/nfc/dhimpl/NativeLlcpServiceSocket;", (void *)com_android_nfc_NfcManager_doCreateLlcpServiceSocket}, - {"doCreateLlcpSocket", "(IIII)Lcom/android/nfc/nxp/NativeLlcpSocket;", + {"doCreateLlcpSocket", "(IIII)Lcom/android/nfc/dhimpl/NativeLlcpSocket;", (void *)com_android_nfc_NfcManager_doCreateLlcpSocket}, {"doGetLastError", "()I", @@ -2616,7 +2616,7 @@ int register_com_android_nfc_NativeNfcManager(JNIEnv *e) } return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeNfcManager", + "com/android/nfc/dhimpl/NativeNfcManager", gMethods, NELEM(gMethods)); } diff --git a/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp b/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp index bf0bffc..bb1bb2a 100755 --- a/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp @@ -763,7 +763,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeNfcSecureElement(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeNfcSecureElement", + "com/android/nfc/dhimpl/NativeNfcSecureElement", gMethods, NELEM(gMethods)); } diff --git a/nxp/jni/com_android_nfc_NativeNfcTag.cpp b/nxp/jni/com_android_nfc_NativeNfcTag.cpp index dbf8dc9..a621d2a 100644 --- a/nxp/jni/com_android_nfc_NativeNfcTag.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcTag.cpp @@ -1248,7 +1248,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeNfcTag(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeNfcTag", + "com/android/nfc/dhimpl/NativeNfcTag", gMethods, NELEM(gMethods)); } diff --git a/nxp/jni/com_android_nfc_NativeP2pDevice.cpp b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp index b3cc6e3..fa46052 100644 --- a/nxp/jni/com_android_nfc_NativeP2pDevice.cpp +++ b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp @@ -483,7 +483,7 @@ static JNINativeMethod gMethods[] = int register_com_android_nfc_NativeP2pDevice(JNIEnv *e) { return jniRegisterNativeMethods(e, - "com/android/nfc/nxp/NativeP2pDevice", + "com/android/nfc/dhimpl/NativeP2pDevice", gMethods, NELEM(gMethods)); } -- cgit v1.1