diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-11 19:28:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-11 19:28:59 +0000 |
| commit | a68b478fbc6ca8d445a3befc7eb8ca58586294eb (patch) | |
| tree | dda43ad7a2b096d9f8e823a851b6ebc20ae8b305 | |
| parent | d30315ef5ce124a83ef4a8d402608f63b0190141 (diff) | |
| parent | f397866ce6d446d3ec5d12a6d002a3ee2d34b9c7 (diff) | |
| download | art-a68b478fbc6ca8d445a3befc7eb8ca58586294eb.zip art-a68b478fbc6ca8d445a3befc7eb8ca58586294eb.tar.gz art-a68b478fbc6ca8d445a3befc7eb8ca58586294eb.tar.bz2 | |
Merge changes I57f70381,I9f225825
* changes:
Fix cpplint issue.
Fix crash when connected to DDMS
| -rw-r--r-- | runtime/mirror/class.h | 2 | ||||
| -rw-r--r-- | runtime/well_known_classes.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index 4a53619..a1097b4 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -139,7 +139,7 @@ class MANAGED Class FINAL : public Object { // // TODO: Explain the other states enum Status { - kStatusRetired = -2, // Retired, should not be used. Use the newly cloned one instead. + kStatusRetired = -2, // Retired, should not be used. Use the newly cloned one instead. kStatusError = -1, kStatusNotReady = 0, kStatusIdx = 1, // Loaded, DEX idx in super_class_type_idx_ and interfaces_type_idx_. 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"); |