diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-09-11 16:23:44 +0200 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-09-11 12:09:40 -0700 |
| commit | b30e0c644d1f15cf7f048ce733131e7ac70772ae (patch) | |
| tree | 3cb14501878ea73e1777658b84c6acdafe91d0fc | |
| parent | 3437531f515d84609fa43baaec32a0d1cc0e3fe0 (diff) | |
| download | art-b30e0c644d1f15cf7f048ce733131e7ac70772ae.zip art-b30e0c644d1f15cf7f048ce733131e7ac70772ae.tar.gz art-b30e0c644d1f15cf7f048ce733131e7ac70772ae.tar.bz2 | |
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
(cherry picked from commit 96cd6714d94b47512710776761dec98c8be68bef)
Change-Id: I9f225825bef4995460e1c79a9f3a6c1331f24201
| -rw-r--r-- | runtime/well_known_classes.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index f66e11a..6b67dfa 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"); |