diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-29 10:21:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-29 10:21:56 -0700 |
| commit | 4d5b4344904b099ea60b770df61d4e19bf23ecf1 (patch) | |
| tree | b0244822020aa7bad48b5fd10d39c31f89c32720 | |
| parent | 51c578b64b7cd3e2fb8c3370d398507e28a47adc (diff) | |
| parent | 84975d535edf98e911caf2a1bca1e7810aa03ccb (diff) | |
| download | dalvik-4d5b4344904b099ea60b770df61d4e19bf23ecf1.tar.gz | |
am 84975d53: am 9813216f: Merge "Track 64-bit nio changes."
* commit '84975d535edf98e911caf2a1bca1e7810aa03ccb':
Track 64-bit nio changes.
| -rw-r--r-- | vm/InitRefs.cpp | 2 | ||||
| -rw-r--r-- | vm/Jni.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vm/InitRefs.cpp b/vm/InitRefs.cpp index 19487dc39..d8f06972a 100644 --- a/vm/InitRefs.cpp +++ b/vm/InitRefs.cpp @@ -251,7 +251,7 @@ static bool initFieldOffsets() { static struct FieldInfo infoBuffer[] = { { &gDvm.offJavaNioBuffer_capacity, "capacity", "I" }, - { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "I" }, + { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "J" }, { NULL, NULL, NULL } }; diff --git a/vm/Jni.cpp b/vm/Jni.cpp index 8808a3f4a..f2358359d 100644 --- a/vm/Jni.cpp +++ b/vm/Jni.cpp @@ -2757,7 +2757,7 @@ static void* GetDirectBufferAddress(JNIEnv* env, jobject jbuf) { // All Buffer objects have an effectiveDirectAddress field. Object* bufObj = dvmDecodeIndirectRef(ts.self(), jbuf); - return (void*) dvmGetFieldInt(bufObj, gDvm.offJavaNioBuffer_effectiveDirectAddress); + return (void*) dvmGetFieldLong(bufObj, gDvm.offJavaNioBuffer_effectiveDirectAddress); } /* |