commit 8165fda0a8e0a54b4b622835f4962e2dd31b89f2
author Sebastien Hertz <shertz@google.com> Wed Sep 10 19:44:39 2014 +0200
committer The Android Automerger <android-build@google.com> Wed Sep 10 11:23:30 2014 -0700
tree 531ba288751b02e2ddc11dba77cc6cf2a7839776
parent 3171cb37105fae912c324bbef44953b73430c3d7

Ensure class is linked before resolution

Adds a missing call to ClassLinker::EnsureResolved to ensure we did link the
class and retired the temp class (placeholder) before doing the resolution.

Bug: 17435441

Change-Id: Ib1a7181d6e5e814ca9299d0504e739a2b69475ef

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index eff2f6f..36247ee 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2008,7 +2008,7 @@
       if (pair.second != nullptr) {
         mirror::Class* klass = LookupClass(descriptor, nullptr);
         if (klass != nullptr) {
-          return klass;
+          return EnsureResolved(self, descriptor, klass);
         }
         klass = DefineClass(descriptor, NullHandle<mirror::ClassLoader>(), *pair.first,
                             *pair.second);