summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2017-02-24 18:43:56 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-24 18:43:56 +0000
commit96b1fb4faaec79c6a84dae60d676b8c5b9ddfe42 (patch)
tree0a26157325ff5b21f5db73e665245b34a56efb43
parenteac19cd55d63bc561b54925cc1763bc1ad738a1f (diff)
parentc878255b5f5bbdb12c5b9c236b3200edc3e5269e (diff)
Merge "Update api for InMemoryDexClassLoader" am: 2f40b2b302
am: c878255b5f Change-Id: Ifaf686ab006aee45447b3fb7c7da97f1a079dffd
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index d681689198c9..a53a4bcd11d7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49485,7 +49485,7 @@ package dalvik.system {
method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
}
- public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+ public final class InMemoryDexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index aae122e6635c..d9b7da14e44e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -53106,7 +53106,7 @@ package dalvik.system {
method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
}
- public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+ public final class InMemoryDexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
}
diff --git a/api/test-current.txt b/api/test-current.txt
index f0de297f686d..4803d04b8fc9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -49578,7 +49578,7 @@ package dalvik.system {
method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
}
- public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+ public final class InMemoryDexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
}