diff options
| author | 2016-11-02 14:31:27 +0000 | |
|---|---|---|
| committer | 2016-11-02 14:31:28 +0000 | |
| commit | 77a0e4541a29c26dba21ed8c1ed1c29ef8d0ce4c (patch) | |
| tree | b5d34c3e68a931ae3ee735718c3ba0296643f9a5 /runtime/native/java_lang_VMClassLoader.cc | |
| parent | c65310326ea87008776bd64ed3bb530d8da644c3 (diff) | |
| parent | 7d8d8ff0727a7aa9d11c738f13a7e06d3c4c3d68 (diff) | |
Merge "Revert "Revert "ART: Generalize FindClassInPathClassLoader"""
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; |