commit 6027871fa3bb32f01ee2f1560e1967d986871c18
author The Android Automerger <android-build@google.com> Tue Oct 15 21:13:50 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 15 21:13:50 2013 -0700
tree f6182da0b1d99645f7ead50df30ebf8448ad0164
parent 31b9d6644cce958ddde939e8c26a08e3f704e3df
parent 6a92d6247afc0ed1bc173eb303883647bc120a6a

merge in klp-release history after reset to klp-dev

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 9248ee4..f072820 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2661,7 +2661,6 @@
   klass->SetName(name);
   mirror::Class* proxy_class = GetClassRoot(kJavaLangReflectProxy);
   klass->SetDexCache(proxy_class->GetDexCache());
-
   klass->SetStatus(mirror::Class::kStatusIdx, self);
 
   // Instance fields are inherited, but we add a couple of static fields...
@@ -2772,6 +2771,9 @@
     CHECK_EQ(synth_proxy_class->GetInterfaces(), interfaces);
     CHECK_EQ(synth_proxy_class->GetThrows(), throws);
   }
+  std::string descriptor(GetDescriptorForProxy(klass.get()));
+  mirror::Class* existing = InsertClass(descriptor.c_str(), klass.get(), Hash(descriptor.c_str()));
+  CHECK(existing == nullptr);
   return klass.get();
 }