From c3d79022340897ef7641a816d086d37ec032f941 Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Tue, 25 Feb 2014 12:28:10 +0000 Subject: 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 Signed-off-by: Ashok Bhat --- nxp/jni/com_android_nfc.cpp | 4 ++-- nxp/jni/com_android_nfc_NativeNfcManager.cpp | 4 ++-- nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nxp') 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 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; -- cgit v1.2.3