summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2017-07-21 18:12:52 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 18:12:52 +0000
commit8ba6d5cae09185c4337ed9d835d48a3c7b05c1ab (patch)
treef3a12a9b10d13d24a4d26e792c2bc9c6af0651dd
parent6ccce0c175996732bce9ed416267fac6e018d1af (diff)
parentb7a1be6051f1a89c7613ef6fe1cb27f4187ff94a (diff)
Merge "Unhide DelegateLastClassLoader." into oc-mr1-dev
am: b7a1be6051 Change-Id: I496b6f7d444f4f3efaea44da9938f615914c4ef4
-rw-r--r--api/current.txt5
-rw-r--r--api/system-current.txt5
-rw-r--r--api/test-current.txt5
3 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 856244449b8b..2428da1a4390 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -52301,6 +52301,11 @@ package dalvik.system {
method protected synchronized java.lang.Package getPackage(java.lang.String);
}
+ public final class DelegateLastClassLoader extends dalvik.system.PathClassLoader {
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.ClassLoader);
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);
+ }
+
public class DexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index d0fa033d113a..47e47ac6f1be 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -56330,6 +56330,11 @@ package dalvik.system {
method protected synchronized java.lang.Package getPackage(java.lang.String);
}
+ public final class DelegateLastClassLoader extends dalvik.system.PathClassLoader {
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.ClassLoader);
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);
+ }
+
public class DexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader);
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 2c2ba307a74e..62f8418b4a71 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -52738,6 +52738,11 @@ package dalvik.system {
method protected synchronized java.lang.Package getPackage(java.lang.String);
}
+ public final class DelegateLastClassLoader extends dalvik.system.PathClassLoader {
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.ClassLoader);
+ ctor public DelegateLastClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);
+ }
+
public class DexClassLoader extends dalvik.system.BaseDexClassLoader {
ctor public DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader);
}