diff options
author | 2016-11-02 12:38:05 +0000 | |
---|---|---|
committer | 2016-11-02 12:38:05 +0000 | |
commit | 7d8d8ff0727a7aa9d11c738f13a7e06d3c4c3d68 (patch) | |
tree | 0f3f131d2d3438d06ecdfc05137ebfcc1ff6f1f3 /runtime/native/java_lang_VMClassLoader.cc | |
parent | af3572bc21cf66f970090c852b976095bb028083 (diff) |
Revert "Revert "ART: Generalize FindClassInPathClassLoader""
Bug: 32510706
Change is not responsible for the flakiness after all.
This reverts commit af3572bc21cf66f970090c852b976095bb028083.
Change-Id: I399049c217deeac6a5c3f9d678a46bdb84386e3f
Diffstat (limited to 'runtime/native/java_lang_VMClassLoader.cc')
-rw-r--r-- | runtime/native/java_lang_VMClassLoader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index e5bab36870..284d2d10c5 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -48,7 +48,7 @@ class VMClassLoader { 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; |