commit 7d8d8ff0727a7aa9d11c738f13a7e06d3c4c3d68
author Nicolas Geoffray <ngeoffray@google.com> Wed Nov 02 12:38:05 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Nov 02 12:38:05 2016 +0000
tree 0f3f131d2d3438d06ecdfc05137ebfcc1ff6f1f3
parent af3572bc21cf66f970090c852b976095bb028083

Revert "Revert "ART: Generalize FindClassInPathClassLoader""

Bug: 32510706

Change is not responsible for the flakiness after all.

This reverts commit af3572bc21cf66f970090c852b976095bb028083.

Change-Id: I399049c217deeac6a5c3f9d678a46bdb84386e3f

runtime/native/java_lang_VMClassLoader.cc

diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index e5bab36..284d2d1 100644
--- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -48,7 +48,7 @@
                                                           Handle<mirror::ClassLoader> class_loader)
       REQUIRES_SHARED(Locks::mutator_lock_) {
     ObjPtr<mirror::Class> result;
-    if (cl->FindClassInPathClassLoader(soa, self, descriptor, hash, class_loader, &result)) {
+    if (cl->FindClassInBaseDexClassLoader(soa, self, descriptor, hash, class_loader, &result)) {
       return result;
     }
     return nullptr;