Use long for java member variables that hold a native pointer

Port to support 64-bit pointers using jlong instead of jint
in JNI modules, and long rather than int in the corresponding
Java modules.

Change-Id: I48bd244a0f7f494b8d0d325a0694fcb6c0b5bd55
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

6 files changed, 10 insertions, 10 deletions

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 0c7ba8bb..2e2a4166 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -555,8 +555,8 @@ static jboolean nfcManager_initNativeStruc (JNIEnv* e, jobject o)
     nat->manager = e->NewGlobalRef(o);
 
     ScopedLocalRef<jclass> cls(e, e->GetObjectClass(o));
-    jfieldID f = e->GetFieldID(cls.get(), "mNative", "I");
-    e->SetIntField(o, f, (jint)nat);
+    jfieldID f = e->GetFieldID(cls.get(), "mNative", "J");
+    e->SetLongField (o, f, (jlong)nat);
 
     /* Initialize native cached references */
     gCachedNfcManagerNotifyNdefMessageListeners = e->GetMethodID(cls.get(),
diff --git a/nci/jni/NfcJniUtil.cpp b/nci/jni/NfcJniUtil.cpp
index 38b10ebd..d3c929a9 100755
--- a/nci/jni/NfcJniUtil.cpp
+++ b/nci/jni/NfcJniUtil.cpp
@@ -135,9 +135,9 @@ int nfc_jni_get_nfc_socket_handle (JNIEnv *e, jobject o)
 struct nfc_jni_native_data* nfc_jni_get_nat(JNIEnv *e, jobject o)
 {
    ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
-   jfieldID f = e->GetFieldID(c.get(), "mNative", "I");
+   jfieldID f = e->GetFieldID(c.get(), "mNative", "J");
    /* Retrieve native structure address */
-   return (struct nfc_jni_native_data*) e->GetIntField(o, f);
+   return (struct nfc_jni_native_data*)e->GetLongField(o, f);
 }
 
 
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 9dae665a..463499ad 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -60,7 +60,7 @@ public class NativeNfcManager implements DeviceHost {
     public static final String INTERNAL_TARGET_DESELECTED_ACTION = "com.android.nfc.action.INTERNAL_TARGET_DESELECTED";
 
     /* Native structure */
-    private int mNative;
+    private long mNative;
 
     private final DeviceHostListener mListener;
     private final Context mContext;
diff --git a/nxp/jni/com_android_nfc.cpp b/nxp/jni/com_android_nfc.cpp
index 2852706a..291bf207 100644
--- a/nxp/jni/com_android_nfc.cpp
+++ b/nxp/jni/com_android_nfc.cpp
@@ -156,8 +156,8 @@ struct nfc_jni_native_data* nfc_jni_get_nat(JNIEnv *e, jobject o)
 {
    /* Retrieve native structure address */
    ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
-   jfieldID f = e->GetFieldID(c.get(), "mNative", "I");
-   return (struct nfc_jni_native_data*) e->GetIntField(o, f);
+   jfieldID f = e->GetFieldID(c.get(), "mNative", "J");
+   return (struct nfc_jni_native_data*)e->GetLongField(o, f);
 }
 
 struct nfc_jni_native_data* nfc_jni_get_nat_ext(JNIEnv *e)
diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
index 81d79c13..fd1cc90a 100644
--- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
@@ -1658,8 +1658,8 @@ static jboolean com_android_nfc_NfcManager_init_native_struc(JNIEnv *e, jobject
    nat->manager = e->NewGlobalRef(o);
 
    cls = e->GetObjectClass(o);
-   f = e->GetFieldID(cls, "mNative", "I");
-   e->SetIntField(o, f, (jint)nat);
+   f = e->GetFieldID(cls, "mNative", "J");
+   e->SetLongField(o, f, (jlong)nat);
 
    /* Initialize native cached references */
    cached_NfcManager_notifyNdefMessageListeners = e->GetMethodID(cls,
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 108025c0..b97516eb 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -70,7 +70,7 @@ public class NativeNfcManager implements DeviceHost {
     public static final String INTERNAL_TARGET_DESELECTED_ACTION = "com.android.nfc.action.INTERNAL_TARGET_DESELECTED";
 
     /* Native structure */
-    private int mNative;
+    private long mNative;
 
     private final DeviceHostListener mListener;
     private final Context mContext;