summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2017-08-10 15:41:36 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-10 15:41:36 +0000
commit9ed2834cba151f13f48ea01bbd5dca7acd3f1e25 (patch)
treeb33623fb548f662693307b539017c80d0ca970ba
parentaff3d6cf6b8b82b72d86a15a703150ed18595a7d (diff)
parent57ae4db22508d3ee764650fec89effb5f3f461c8 (diff)
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
am: 57ae4db225 Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6
-rw-r--r--core/java/com/android/internal/os/ClassLoaderFactory.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/ClassLoaderFactory.java b/core/java/com/android/internal/os/ClassLoaderFactory.java
index 0df420b417fd..b2b769ee2fec 100644
--- a/core/java/com/android/internal/os/ClassLoaderFactory.java
+++ b/core/java/com/android/internal/os/ClassLoaderFactory.java
@@ -71,7 +71,7 @@ public class ClassLoaderFactory {
String librarySearchPath, ClassLoader parent, String classloaderName) {
if (isPathClassLoaderName(classloaderName)) {
return new PathClassLoader(dexPath, librarySearchPath, parent);
- } else if (isPathClassLoaderName(classloaderName)) {
+ } else if (isDelegateLastClassLoaderName(classloaderName)) {
return new DelegateLastClassLoader(dexPath, librarySearchPath, parent);
}