Update Dalvik luni module to Harmony 772995. Prior to submission (fbfa9d14) · Commits · e / os / android_frameworks_base

api/current.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -193475,7 +193475,7 @@
		<method name="valid"
		return="boolean"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -198598,7 +198598,7 @@
		return="java.nio.channels.FileChannel"
		abstract="false"
		native="false"
		synchronized="false"
		synchronized="true"
		static="false"
		final="true"
		deprecated="not deprecated"
		@@ -207455,7 +207455,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="i" type="int">
		<parameter name="value" type="int">
		</parameter>
		</method>
		<method name="toString"
		@@ -273628,7 +273628,7 @@
		return="void"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -273641,7 +273641,7 @@
		return="void"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -273652,7 +273652,7 @@
		return="int"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -273687,7 +273687,7 @@
		return="boolean"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -273722,7 +273722,7 @@
		return="void"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -276045,7 +276045,7 @@
		return="E"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -277422,7 +277422,7 @@
		return="E"
		abstract="false"
		native="false"
		synchronized="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"

preloaded-classes

+8 −10

Original line number	Diff line number	Diff line
		@@ -845,16 +845,18 @@ java.util.GregorianCalendar
		java.util.HashMap
		java.util.HashMap$1
		java.util.HashMap$2
		java.util.HashMap$2$1
		java.util.HashMap$AbstractMapIterator
		java.util.HashMap$Entry
		java.util.HashMap$EntryIterator
		java.util.HashMap$HashMapEntrySet
		java.util.HashMap$HashMapEntrySet$1
		java.util.HashMap$KeyIterator
		java.util.HashMap$ValueIterator
		java.util.HashSet
		java.util.Hashtable
		java.util.Hashtable$4
		java.util.Hashtable$4$1
		java.util.Hashtable$6
		java.util.Hashtable$6$1
		java.util.Hashtable$Entry
		java.util.Hashtable$HashEnumerator
		java.util.Hashtable$HashEnumIterator
		java.util.Hashtable$HashIterator
		java.util.IdentityHashMap
		java.util.LinkedHashMap
		@@ -869,7 +871,7 @@ java.util.ResourceBundle
		java.util.SimpleTimeZone
		java.util.TimeZone
		java.util.TreeMap
		java.util.TreeMap$Entry
		java.util.TreeMap$MapEntry
		java.util.TreeSet
		java.util.Vector
		java.util.WeakHashMap
		@@ -952,14 +954,11 @@ org.apache.harmony.luni.internal.net.www.protocol.https.Handler
		org.apache.harmony.luni.internal.net.www.protocol.jar.Handler
		org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection
		org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection$1
		org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection$CacheEntry
		org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection$JarURLConnectionInputStream
		org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection$LRUComparator
		org.apache.harmony.luni.internal.util.TimezoneGetter
		org.apache.harmony.luni.internal.util.ZoneInfo
		org.apache.harmony.luni.internal.util.ZoneInfoDB
		org.apache.harmony.luni.net.PlainSocketImpl
		org.apache.harmony.luni.net.PlainSocketImpl2
		org.apache.harmony.luni.platform.PlatformAddress
		org.apache.harmony.luni.util.TwoKeyHashMap
		org.apache.harmony.nio.internal.FileChannelImpl$RepositioningLock
		@@ -1176,4 +1175,3 @@ org.xml.sax.helpers.NewInstance
		org.xmlpull.v1.XmlPullParserFactory
		org.xmlpull.v1.sax2.Driver
		sun.misc.Unsafe