diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-28 15:29:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-28 15:29:44 +0000 |
| commit | ef64fc32d412d64e180cb90ee29ff46af7391580 (patch) | |
| tree | fa86173bbfc35a323edd8af1a894f59c755f1dff | |
| parent | 694762158ac19c2abd795d7af78d3d9b9318a7d3 (diff) | |
| parent | 9a58f1be9378c1de90ad3b5e34f1d842624d234d (diff) | |
| download | dalvik-ef64fc32d412d64e180cb90ee29ff46af7391580.tar.gz | |
Merge "Track libcore DirectByteBuffer cleanup."
| -rw-r--r-- | vm/Globals.h | 4 | ||||
| -rw-r--r-- | vm/InitRefs.cpp | 4 | ||||
| -rw-r--r-- | vm/Jni.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vm/Globals.h b/vm/Globals.h index 565c92a65..234a57d84 100644 --- a/vm/Globals.h +++ b/vm/Globals.h @@ -268,7 +268,7 @@ struct DvmGlobals { ClassObject* classJavaLangReflectMethod; ClassObject* classJavaLangReflectMethodArray; ClassObject* classJavaLangReflectProxy; - ClassObject* classJavaNioReadWriteDirectByteBuffer; + ClassObject* classJavaNioDirectByteBuffer; ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationFactory; ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMember; ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMemberArray; @@ -415,7 +415,7 @@ struct DvmGlobals { Method* methDalvikSystemNativeStart_run; /* assorted direct buffer helpers */ - Method* methJavaNioReadWriteDirectByteBuffer_init; + Method* methJavaNioDirectByteBuffer_init; int offJavaNioBuffer_capacity; int offJavaNioBuffer_effectiveDirectAddress; diff --git a/vm/InitRefs.cpp b/vm/InitRefs.cpp index c4836045b..19487dc39 100644 --- a/vm/InitRefs.cpp +++ b/vm/InitRefs.cpp @@ -127,7 +127,7 @@ static bool initClassReferences() { { &gDvm.classJavaLangReflectMethod, "Ljava/lang/reflect/Method;" }, { &gDvm.classJavaLangReflectMethodArray, "[Ljava/lang/reflect/Method;"}, { &gDvm.classJavaLangReflectProxy, "Ljava/lang/reflect/Proxy;" }, - { &gDvm.classJavaNioReadWriteDirectByteBuffer, "Ljava/nio/ReadWriteDirectByteBuffer;" }, + { &gDvm.classJavaNioDirectByteBuffer, "Ljava/nio/DirectByteBuffer;" }, { &gDvm.classOrgApacheHarmonyDalvikDdmcChunk, "Lorg/apache/harmony/dalvik/ddmc/Chunk;" }, { &gDvm.classOrgApacheHarmonyDalvikDdmcDdmServer, @@ -331,7 +331,7 @@ static bool initConstructorReferences() { { &gDvm.methJavaLangReflectMethod_init, "Ljava/lang/reflect/Method;", "(Ljava/lang/Class;[Ljava/lang/Class;[Ljava/lang/Class;Ljava/lang/Class;" "Ljava/lang/String;I)V" }, - { &gDvm.methJavaNioReadWriteDirectByteBuffer_init, "Ljava/nio/ReadWriteDirectByteBuffer;", + { &gDvm.methJavaNioDirectByteBuffer_init, "Ljava/nio/DirectByteBuffer;", "(II)V" }, { &gDvm.methOrgApacheHarmonyLangAnnotationAnnotationMember_init, "Lorg/apache/harmony/lang/annotation/AnnotationMember;", diff --git a/vm/Jni.cpp b/vm/Jni.cpp index 78a4093f4..8808a3f4a 100644 --- a/vm/Jni.cpp +++ b/vm/Jni.cpp @@ -2726,8 +2726,8 @@ static jobject NewDirectByteBuffer(JNIEnv* env, void* address, jlong capacity) { ReportJniError(); } - /* create an instance of java.nio.ReadWriteDirectByteBuffer */ - ClassObject* bufferClazz = gDvm.classJavaNioReadWriteDirectByteBuffer; + /* create an instance of java.nio.DirectByteBuffer */ + ClassObject* bufferClazz = gDvm.classJavaNioDirectByteBuffer; if (!dvmIsClassInitialized(bufferClazz) && !dvmInitClass(bufferClazz)) { return NULL; } @@ -2738,7 +2738,7 @@ static jobject NewDirectByteBuffer(JNIEnv* env, void* address, jlong capacity) { /* call the constructor */ jobject result = addLocalReference(ts.self(), newObj); JValue unused; - dvmCallMethod(ts.self(), gDvm.methJavaNioReadWriteDirectByteBuffer_init, + dvmCallMethod(ts.self(), gDvm.methJavaNioDirectByteBuffer_init, newObj, &unused, (jint) address, (jint) capacity); if (dvmGetException(ts.self()) != NULL) { deleteLocalReference(ts.self(), result); |