diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-04-20 22:00:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2015-04-21 19:48:53 -0700 |
| commit | 31ae6d22605a0967d722f935bc3a8b868ada4917 (patch) | |
| tree | c52f58d7a6733df669c47be53f9fb7a5327f7d1f /libart/src/main/java/dalvik/system/VMStack.java | |
| parent | d128a4cbeceef48b508ec076c536fb81f8a8b88f (diff) | |
| download | libcore-31ae6d22605a0967d722f935bc3a8b868ada4917.zip libcore-31ae6d22605a0967d722f935bc3a8b868ada4917.tar.gz libcore-31ae6d22605a0967d722f935bc3a8b868ada4917.tar.bz2 | |
Fix Class.forName(..., ..., null) to pass 068-classloader's testClassForName
This caused fallout elsewhere requiring
- Package fix to pass 005-annotations
- ObjectInputStream fix to pass 093-serialization
Change-Id: I6bc470e20fa177e8a3debe55c90a84eef7ef518e
Diffstat (limited to 'libart/src/main/java/dalvik/system/VMStack.java')
| -rw-r--r-- | libart/src/main/java/dalvik/system/VMStack.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libart/src/main/java/dalvik/system/VMStack.java b/libart/src/main/java/dalvik/system/VMStack.java index ee0a0db..b69ab60 100644 --- a/libart/src/main/java/dalvik/system/VMStack.java +++ b/libart/src/main/java/dalvik/system/VMStack.java @@ -48,11 +48,10 @@ public final class VMStack { native public static Class<?> getStackClass2(); /** - * Returns the first ClassLoader on the call stack that isn't either of - * the passed-in ClassLoaders. + * Returns the first ClassLoader on the call stack that isn't the + * bootstrap class loader. */ - public native static ClassLoader getClosestUserClassLoader(ClassLoader bootstrap, - ClassLoader system); + public native static ClassLoader getClosestUserClassLoader(); /** * Retrieves the stack trace from the specified thread. |