Merge "Introduce VMRuntime#isValidClassLoaderContext" am: 17b24aef4e
Change-Id: I15d007464d2ef28af3bc37eefca67bde29517138
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 6171cb6..863f85d 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -744,4 +744,15 @@
*/
@libcore.api.CorePlatformApi
public static native void setProcessDataDirectory(String dataDir);
+
+ /**
+ * Returns whether {@code encodedClassLoaderContext} is a valid encoded class loader context.
+ * A class loader context is an internal opaque format used by the runtime to encode the
+ * class loader hierarchy (including each ClassLoader's classpath) used to load a dex file.
+ *
+ * @return True if encodedClassLoaderContext is a non-null valid encoded class loader context.
+ * Throws NullPointerException if encodedClassLoaderContext is null.
+ */
+ @libcore.api.CorePlatformApi
+ public static native boolean isValidClassLoaderContext(String encodedClassLoaderContext);
}
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index c3a603c..707e3a3 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -698,6 +698,7 @@
method public static boolean isBootClassPathOnDisk(String);
method @dalvik.annotation.optimization.FastNative public boolean isCheckJniEnabled();
method @dalvik.annotation.optimization.FastNative public boolean isNativeDebuggable();
+ method public static boolean isValidClassLoaderContext(String);
method @dalvik.annotation.optimization.FastNative public Object newNonMovableArray(Class<?>, int);
method @dalvik.annotation.optimization.FastNative public Object newUnpaddedArray(Class<?>, int);
method public void notifyStartupCompleted();