Merge "frameworks/base updates to track merge from dalvik-dev - frameworks and... (2658cf47) · Commits · e / os / android_frameworks_base

Android.mk

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -194,7 +194,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
	$(framework-res-source-path)/com/android/internal/R.java		$(framework-res-source-path)/com/android/internal/R.java

	LOCAL_NO_STANDARD_LIBRARIES := true		LOCAL_NO_STANDARD_LIBRARIES := true
	LOCAL_JAVA_LIBRARIES := core core-junit ext		LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext

	LOCAL_MODULE := framework		LOCAL_MODULE := framework
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
	@@ -342,6 +342,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
	$(framework-res-source-path)/com/android/internal/R.java		$(framework-res-source-path)/com/android/internal/R.java

	framework_docs_LOCAL_JAVA_LIBRARIES := \		framework_docs_LOCAL_JAVA_LIBRARIES := \
			bouncycastle \
	core \		core \
	ext \		ext \
	framework \		framework \

api/9.xml

+19 −19

Original line number	Original line	Diff line number	Diff line
	@@ -231195,7 +231195,7 @@
	>		>
	</method>		</method>
	<method name="getClasses"		<method name="getClasses"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -231226,7 +231226,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -231234,7 +231234,7 @@
	</exception>		</exception>
	</method>		</method>
	<method name="getConstructors"		<method name="getConstructors"
	return="java.lang.reflect.Constructor[]"		return="java.lang.reflect.Constructor<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -231258,7 +231258,7 @@
	>		>
	</method>		</method>
	<method name="getDeclaredClasses"		<method name="getDeclaredClasses"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -231280,7 +231280,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -231288,7 +231288,7 @@
	</exception>		</exception>
	</method>		</method>
	<method name="getDeclaredConstructors"		<method name="getDeclaredConstructors"
	return="java.lang.reflect.Constructor[]"		return="java.lang.reflect.Constructor<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -231342,7 +231342,7 @@
	>		>
	<parameter name="name" type="java.lang.String">		<parameter name="name" type="java.lang.String">
	</parameter>		</parameter>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -231470,7 +231470,7 @@
	>		>
	</method>		</method>
	<method name="getInterfaces"		<method name="getInterfaces"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="true"		native="true"
	synchronized="false"		synchronized="false"
	@@ -231492,7 +231492,7 @@
	>		>
	<parameter name="name" type="java.lang.String">		<parameter name="name" type="java.lang.String">
	</parameter>		</parameter>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -243214,7 +243214,7 @@
	>		>
	<parameter name="componentType" type="java.lang.Class<?>">		<parameter name="componentType" type="java.lang.Class<?>">
	</parameter>		</parameter>
	<parameter name="dimensions" type="int[]">		<parameter name="dimensions" type="int...">
	</parameter>		</parameter>
	<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">		<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
	</exception>		</exception>
	@@ -244172,7 +244172,7 @@
	visibility="public"		visibility="public"
	>		>
	<method name="getDeclaringClass"		<method name="getDeclaringClass"
	return="java.lang.Class"		return="java.lang.Class<?>"
	abstract="true"		abstract="true"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -338875,7 +338875,7 @@
	</parameter>		</parameter>
	</constructor>		</constructor>
	<method name="doAs"		<method name="doAs"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -338886,11 +338886,11 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedAction">		<parameter name="action" type="java.security.PrivilegedAction<T>">
	</parameter>		</parameter>
	</method>		</method>
	<method name="doAs"		<method name="doAs"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -338901,13 +338901,13 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedExceptionAction">		<parameter name="action" type="java.security.PrivilegedExceptionAction<T>">
	</parameter>		</parameter>
	<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">		<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">
	</exception>		</exception>
	</method>		</method>
	<method name="doAsPrivileged"		<method name="doAsPrivileged"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -338918,13 +338918,13 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedAction">		<parameter name="action" type="java.security.PrivilegedAction<T>">
	</parameter>		</parameter>
	<parameter name="context" type="java.security.AccessControlContext">		<parameter name="context" type="java.security.AccessControlContext">
	</parameter>		</parameter>
	</method>		</method>
	<method name="doAsPrivileged"		<method name="doAsPrivileged"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -338935,7 +338935,7 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedExceptionAction">		<parameter name="action" type="java.security.PrivilegedExceptionAction<T>">
	</parameter>		</parameter>
	<parameter name="context" type="java.security.AccessControlContext">		<parameter name="context" type="java.security.AccessControlContext">
	</parameter>		</parameter>

api/current.xml

+154 −45

Original line number	Original line	Diff line number	Diff line
	@@ -234855,7 +234855,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="dest" type="java.io.PipedReader">		<parameter name="destination" type="java.io.PipedReader">
	</parameter>		</parameter>
	<exception name="IOException" type="java.io.IOException">		<exception name="IOException" type="java.io.IOException">
	</exception>		</exception>
	@@ -242004,7 +242004,7 @@
	>		>
	</method>		</method>
	<method name="getClasses"		<method name="getClasses"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -242035,7 +242035,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -242043,7 +242043,7 @@
	</exception>		</exception>
	</method>		</method>
	<method name="getConstructors"		<method name="getConstructors"
	return="java.lang.reflect.Constructor[]"		return="java.lang.reflect.Constructor<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -242067,7 +242067,7 @@
	>		>
	</method>		</method>
	<method name="getDeclaredClasses"		<method name="getDeclaredClasses"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -242089,7 +242089,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -242097,7 +242097,7 @@
	</exception>		</exception>
	</method>		</method>
	<method name="getDeclaredConstructors"		<method name="getDeclaredConstructors"
	return="java.lang.reflect.Constructor[]"		return="java.lang.reflect.Constructor<?>[]"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -242151,7 +242151,7 @@
	>		>
	<parameter name="name" type="java.lang.String">		<parameter name="name" type="java.lang.String">
	</parameter>		</parameter>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -242279,7 +242279,7 @@
	>		>
	</method>		</method>
	<method name="getInterfaces"		<method name="getInterfaces"
	return="java.lang.Class[]"		return="java.lang.Class<?>[]"
	abstract="false"		abstract="false"
	native="true"		native="true"
	synchronized="false"		synchronized="false"
	@@ -242301,7 +242301,7 @@
	>		>
	<parameter name="name" type="java.lang.String">		<parameter name="name" type="java.lang.String">
	</parameter>		</parameter>
	<parameter name="parameterTypes" type="java.lang.Class...">		<parameter name="parameterTypes" type="java.lang.Class<?>...">
	</parameter>		</parameter>
	<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">		<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">
	</exception>		</exception>
	@@ -245900,10 +245900,10 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="x" type="double">
	</parameter>
	<parameter name="y" type="double">		<parameter name="y" type="double">
	</parameter>		</parameter>
			<parameter name="x" type="double">
			</parameter>
	</method>		</method>
	<method name="cbrt"		<method name="cbrt"
	return="double"		return="double"
	@@ -249723,7 +249723,7 @@
	</parameter>		</parameter>
	<parameter name="length" type="int">		<parameter name="length" type="int">
	</parameter>		</parameter>
	<parameter name="encoding" type="java.lang.String">		<parameter name="charsetName" type="java.lang.String">
	</parameter>		</parameter>
	<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">		<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">
	</exception>		</exception>
	@@ -249737,7 +249737,7 @@
	>		>
	<parameter name="data" type="byte[]">		<parameter name="data" type="byte[]">
	</parameter>		</parameter>
	<parameter name="encoding" type="java.lang.String">		<parameter name="charsetName" type="java.lang.String">
	</parameter>		</parameter>
	<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">		<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">
	</exception>		</exception>
	@@ -249755,7 +249755,7 @@
	</parameter>		</parameter>
	<parameter name="length" type="int">		<parameter name="length" type="int">
	</parameter>		</parameter>
	<parameter name="encoding" type="java.nio.charset.Charset">		<parameter name="charset" type="java.nio.charset.Charset">
	</parameter>		</parameter>
	</constructor>		</constructor>
	<constructor name="String"		<constructor name="String"
	@@ -249767,7 +249767,7 @@
	>		>
	<parameter name="data" type="byte[]">		<parameter name="data" type="byte[]">
	</parameter>		</parameter>
	<parameter name="encoding" type="java.nio.charset.Charset">		<parameter name="charset" type="java.nio.charset.Charset">
	</parameter>		</parameter>
	</constructor>		</constructor>
	<constructor name="String"		<constructor name="String"
	@@ -250058,17 +250058,6 @@
	<parameter name="args" type="java.lang.Object...">		<parameter name="args" type="java.lang.Object...">
	</parameter>		</parameter>
	</method>		</method>
	<method name="getBytes"
	return="byte[]"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="getBytes"		<method name="getBytes"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -250098,7 +250087,18 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="encoding" type="java.lang.String">		</method>
			<method name="getBytes"
			return="byte[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="charsetName" type="java.lang.String">
	</parameter>		</parameter>
	<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">		<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">
	</exception>		</exception>
	@@ -250113,7 +250113,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="encoding" type="java.nio.charset.Charset">		<parameter name="charset" type="java.nio.charset.Charset">
	</parameter>		</parameter>
	</method>		</method>
	<method name="getChars"		<method name="getChars"
	@@ -254447,7 +254447,7 @@
	>		>
	<parameter name="componentType" type="java.lang.Class<?>">		<parameter name="componentType" type="java.lang.Class<?>">
	</parameter>		</parameter>
	<parameter name="dimensions" type="int[]">		<parameter name="dimensions" type="int...">
	</parameter>		</parameter>
	<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">		<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
	</exception>		</exception>
	@@ -255405,7 +255405,7 @@
	visibility="public"		visibility="public"
	>		>
	<method name="getDeclaringClass"		<method name="getDeclaringClass"
	return="java.lang.Class"		return="java.lang.Class<?>"
	abstract="true"		abstract="true"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -272444,7 +272444,7 @@
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="true"		synchronized="false"
	static="true"		static="true"
	final="false"		final="false"
	deprecated="not deprecated"		deprecated="not deprecated"
	@@ -273600,7 +273600,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="perm" type="java.security.Permission">		<parameter name="permission" type="java.security.Permission">
	</parameter>		</parameter>
	<exception name="AccessControlException" type="java.security.AccessControlException">		<exception name="AccessControlException" type="java.security.AccessControlException">
	</exception>		</exception>
	@@ -273665,6 +273665,34 @@
	<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">		<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">
	</exception>		</exception>
	</method>		</method>
			<method name="doPrivilegedWithCombiner"
			return="T"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="action" type="java.security.PrivilegedAction<T>">
			</parameter>
			</method>
			<method name="doPrivilegedWithCombiner"
			return="T"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="action" type="java.security.PrivilegedExceptionAction<T>">
			</parameter>
			<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">
			</exception>
			</method>
	<method name="getContext"		<method name="getContext"
	return="java.security.AccessControlContext"		return="java.security.AccessControlContext"
	abstract="false"		abstract="false"
	@@ -316246,7 +316274,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="f" type="java.lang.String">		<parameter name="flags" type="java.lang.String">
	</parameter>		</parameter>
	</constructor>		</constructor>
	<method name="getFlags"		<method name="getFlags"
	@@ -339984,8 +340012,6 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="input" type="java.lang.CharSequence">
	</parameter>
	</method>		</method>
	<method name="reset"		<method name="reset"
	return="java.util.regex.Matcher"		return="java.util.regex.Matcher"
	@@ -339997,6 +340023,8 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
			<parameter name="input" type="java.lang.CharSequence">
			</parameter>
	</method>		</method>
	<method name="start"		<method name="start"
	return="int"		return="int"
	@@ -361344,7 +361372,7 @@
	</parameter>		</parameter>
	</constructor>		</constructor>
	<method name="doAs"		<method name="doAs"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -361355,11 +361383,11 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedAction">		<parameter name="action" type="java.security.PrivilegedAction<T>">
	</parameter>		</parameter>
	</method>		</method>
	<method name="doAs"		<method name="doAs"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -361370,13 +361398,13 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedExceptionAction">		<parameter name="action" type="java.security.PrivilegedExceptionAction<T>">
	</parameter>		</parameter>
	<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">		<exception name="PrivilegedActionException" type="java.security.PrivilegedActionException">
	</exception>		</exception>
	</method>		</method>
	<method name="doAsPrivileged"		<method name="doAsPrivileged"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -361387,13 +361415,13 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedAction">		<parameter name="action" type="java.security.PrivilegedAction<T>">
	</parameter>		</parameter>
	<parameter name="context" type="java.security.AccessControlContext">		<parameter name="context" type="java.security.AccessControlContext">
	</parameter>		</parameter>
	</method>		</method>
	<method name="doAsPrivileged"		<method name="doAsPrivileged"
	return="java.lang.Object"		return="T"
	abstract="false"		abstract="false"
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	@@ -361404,7 +361432,7 @@
	>		>
	<parameter name="subject" type="javax.security.auth.Subject">		<parameter name="subject" type="javax.security.auth.Subject">
	</parameter>		</parameter>
	<parameter name="action" type="java.security.PrivilegedExceptionAction">		<parameter name="action" type="java.security.PrivilegedExceptionAction<T>">
	</parameter>		</parameter>
	<parameter name="context" type="java.security.AccessControlContext">		<parameter name="context" type="java.security.AccessControlContext">
	</parameter>		</parameter>
	@@ -365963,6 +365991,23 @@
	<exception name="DatatypeConfigurationException" type="javax.xml.datatype.DatatypeConfigurationException">		<exception name="DatatypeConfigurationException" type="javax.xml.datatype.DatatypeConfigurationException">
	</exception>		</exception>
	</method>		</method>
			<method name="newInstance"
			return="javax.xml.datatype.DatatypeFactory"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="factoryClassName" type="java.lang.String">
			</parameter>
			<parameter name="classLoader" type="java.lang.ClassLoader">
			</parameter>
			<exception name="DatatypeConfigurationException" type="javax.xml.datatype.DatatypeConfigurationException">
			</exception>
			</method>
	<method name="newXMLGregorianCalendar"		<method name="newXMLGregorianCalendar"
	return="javax.xml.datatype.XMLGregorianCalendar"		return="javax.xml.datatype.XMLGregorianCalendar"
	abstract="true"		abstract="true"
	@@ -367469,6 +367514,21 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="newInstance"
			return="javax.xml.parsers.DocumentBuilderFactory"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="factoryClassName" type="java.lang.String">
			</parameter>
			<parameter name="classLoader" type="java.lang.ClassLoader">
			</parameter>
			</method>
	<method name="setAttribute"		<method name="setAttribute"
	return="void"		return="void"
	abstract="true"		abstract="true"
	@@ -368113,6 +368173,21 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="newInstance"
			return="javax.xml.parsers.SAXParserFactory"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="factoryClassName" type="java.lang.String">
			</parameter>
			<parameter name="classLoader" type="java.lang.ClassLoader">
			</parameter>
			</method>
	<method name="newSAXParser"		<method name="newSAXParser"
	return="javax.xml.parsers.SAXParser"		return="javax.xml.parsers.SAXParser"
	abstract="true"		abstract="true"
	@@ -369034,6 +369109,23 @@
	<exception name="TransformerFactoryConfigurationError" type="javax.xml.transform.TransformerFactoryConfigurationError">		<exception name="TransformerFactoryConfigurationError" type="javax.xml.transform.TransformerFactoryConfigurationError">
	</exception>		</exception>
	</method>		</method>
			<method name="newInstance"
			return="javax.xml.transform.TransformerFactory"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="factoryClassName" type="java.lang.String">
			</parameter>
			<parameter name="classLoader" type="java.lang.ClassLoader">
			</parameter>
			<exception name="TransformerFactoryConfigurationError" type="javax.xml.transform.TransformerFactoryConfigurationError">
			</exception>
			</method>
	<method name="newTemplates"		<method name="newTemplates"
	return="javax.xml.transform.Templates"		return="javax.xml.transform.Templates"
	abstract="true"		abstract="true"
	@@ -370475,13 +370567,30 @@
	native="false"		native="false"
	synchronized="false"		synchronized="false"
	static="true"		static="true"
	final="true"		final="false"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="schemaLanguage" type="java.lang.String">		<parameter name="schemaLanguage" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
			<method name="newInstance"
			return="javax.xml.validation.SchemaFactory"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="schemaLanguage" type="java.lang.String">
			</parameter>
			<parameter name="factoryClassName" type="java.lang.String">
			</parameter>
			<parameter name="classLoader" type="java.lang.ClassLoader">
			</parameter>
			</method>
	<method name="newSchema"		<method name="newSchema"
	return="javax.xml.validation.Schema"		return="javax.xml.validation.Schema"
	abstract="false"		abstract="false"

preloaded-classes

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -845,6 +845,7 @@ java.math.BigDecimal
	java.math.BigInt		java.math.BigInt
	java.math.BigInteger		java.math.BigInteger
	java.math.Multiplication		java.math.Multiplication
			java.math.NativeBN
	java.net.AddressCache		java.net.AddressCache
	java.net.AddressCache$1		java.net.AddressCache$1
	java.net.ConnectException		java.net.ConnectException
	@@ -1249,7 +1250,6 @@ org.ccil.cowan.tagsoup.Parser
	org.json.JSONObject		org.json.JSONObject
	org.kxml2.io.KXmlParser		org.kxml2.io.KXmlParser
	org.kxml2.io.KXmlSerializer		org.kxml2.io.KXmlSerializer
	org.openssl.NativeBN
	org.xml.sax.Attributes		org.xml.sax.Attributes
	org.xml.sax.InputSource		org.xml.sax.InputSource
	org.xml.sax.helpers.AttributesImpl		org.xml.sax.helpers.AttributesImpl

tests/CoreTests/android/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := tests
	LOCAL_SRC_FILES := \		LOCAL_SRC_FILES := \
	$(call all-subdir-java-files)		$(call all-subdir-java-files)

	LOCAL_JAVA_LIBRARIES := android.test.runner		LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle

	LOCAL_PACKAGE_NAME := CoreTests		LOCAL_PACKAGE_NAME := CoreTests