From 7d8d8ff0727a7aa9d11c738f13a7e06d3c4c3d68 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 2 Nov 2016 12:38:05 +0000 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/native/java_lang_VMClassLoader.cc') 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 class_loader) REQUIRES_SHARED(Locks::mutator_lock_) { ObjPtr 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; -- cgit v1.2.3-59-g8ed1b