From 96cd6714d94b47512710776761dec98c8be68bef Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Thu, 11 Sep 2014 16:23:44 +0200 Subject: [PATCH] Fix crash when connected to DDMS Restore init of WellKnownClasses::org_apache_harmony_dalvik_ddmc_Chunk_data and removed duplicated line. Bug: 17467328 Bug: 17463118 Change-Id: I64638e23615b7c20061b49c41a9c0e9f35a4d537 --- runtime/well_known_classes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index f66e11a3d..6b67dfac8 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -222,9 +222,9 @@ void WellKnownClasses::Init(JNIEnv* env) { java_lang_reflect_Proxy_h = CacheField(env, java_lang_reflect_Proxy, false, "h", "Ljava/lang/reflect/InvocationHandler;"); java_nio_DirectByteBuffer_capacity = CacheField(env, java_nio_DirectByteBuffer, false, "capacity", "I"); java_nio_DirectByteBuffer_effectiveDirectAddress = CacheField(env, java_nio_DirectByteBuffer, false, "effectiveDirectAddress", "J"); - java_nio_DirectByteBuffer_effectiveDirectAddress = CacheField(env, java_nio_DirectByteBuffer, false, "effectiveDirectAddress", "J"); java_util_Collections_EMPTY_LIST = CacheField(env, java_util_Collections, true, "EMPTY_LIST", "Ljava/util/List;"); libcore_util_EmptyArray_STACK_TRACE_ELEMENT = CacheField(env, libcore_util_EmptyArray, true, "STACK_TRACE_ELEMENT", "[Ljava/lang/StackTraceElement;"); + org_apache_harmony_dalvik_ddmc_Chunk_data = CacheField(env, org_apache_harmony_dalvik_ddmc_Chunk, false, "data", "[B"); org_apache_harmony_dalvik_ddmc_Chunk_length = CacheField(env, org_apache_harmony_dalvik_ddmc_Chunk, false, "length", "I"); org_apache_harmony_dalvik_ddmc_Chunk_offset = CacheField(env, org_apache_harmony_dalvik_ddmc_Chunk, false, "offset", "I"); org_apache_harmony_dalvik_ddmc_Chunk_type = CacheField(env, org_apache_harmony_dalvik_ddmc_Chunk, false, "type", "I"); -- 2.11.0