Track libcore DirectByteBuffer cleanup.

Bug: https://code.google.com/p/android/issues/detail?id=53637
Change-Id: I7acd990a2a48b41dacb5b09f6410b4634dd60438

diff --git a/vm/Globals.h b/vm/Globals.h
index 565c92a..234a57d 100644 (file)
--- 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 c483604..19487dc 100644 (file)
--- 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 78a4093..8808a3f 100644 (file)
--- 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);