Updating api.xml for merge of dalvik-dev to master (3f89edc8) · Commits · e / os / android_frameworks_base

api/current.xml

+281 −38

Original line number	Diff line number	Diff line
		@@ -249335,7 +249335,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>
		@@ -249367,6 +249367,25 @@
		</package>
		<package name="dalvik.bytecode"
		>
		<class name="OpcodeInfo"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<field name="MAXIMUM_VALUE"
		type="int"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<interface name="Opcodes"
		abstract="true"
		static="false"
		@@ -249722,7 +249741,7 @@
		value="236"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250063,7 +250082,7 @@
		value="238"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250074,7 +250093,7 @@
		value="239"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250371,7 +250390,7 @@
		value="244"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250382,7 +250401,7 @@
		value="242"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250415,7 +250434,7 @@
		value="243"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250426,7 +250445,7 @@
		value="232"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250525,7 +250544,7 @@
		value="240"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250602,7 +250621,7 @@
		value="250"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250613,7 +250632,7 @@
		value="251"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250646,7 +250665,7 @@
		value="248"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250657,7 +250676,7 @@
		value="249"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250734,7 +250753,7 @@
		value="247"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250745,7 +250764,7 @@
		value="245"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250778,7 +250797,7 @@
		value="246"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -250789,7 +250808,7 @@
		value="233"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -251537,7 +251556,7 @@
		value="234"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -251746,7 +251765,7 @@
		value="235"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -251856,7 +251875,7 @@
		value="237"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -334583,7 +334602,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="minSize" type="int">
		<parameter name="numElements" type="int">
		</parameter>
		</constructor>
		<constructor name="ArrayDeque"
		@@ -334849,7 +334868,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="obj" type="java.lang.Object">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="removeLast"
		@@ -334873,7 +334892,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="obj" type="java.lang.Object">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="size"
		@@ -339631,6 +339650,19 @@
		>
		<implements name="java.util.Queue">
		</implements>
		<method name="add"
		return="boolean"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="addFirst"
		return="void"
		abstract="true"
		@@ -339657,6 +339689,19 @@
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="contains"
		return="boolean"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="descendingIterator"
		return="java.util.Iterator<E>"
		abstract="true"
		@@ -339668,6 +339713,17 @@
		visibility="public"
		>
		</method>
		<method name="element"
		return="E"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getFirst"
		return="E"
		abstract="true"
		@@ -339690,6 +339746,30 @@
		visibility="public"
		>
		</method>
		<method name="iterator"
		return="java.util.Iterator<E>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="offer"
		return="boolean"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="offerFirst"
		return="boolean"
		abstract="true"
		@@ -339716,6 +339796,17 @@
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="peek"
		return="E"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="peekFirst"
		return="E"
		abstract="true"
		@@ -339738,6 +339829,17 @@
		visibility="public"
		>
		</method>
		<method name="poll"
		return="E"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="pollFirst"
		return="E"
		abstract="true"
		@@ -339784,6 +339886,30 @@
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="remove"
		return="E"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="remove"
		return="boolean"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="removeFirst"
		return="E"
		abstract="true"
		@@ -339832,6 +339958,17 @@
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="size"
		return="int"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		</interface>
		<class name="Dictionary"
		extends="java.lang.Object"
		@@ -343756,11 +343893,24 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="endKey" type="K">
		<parameter name="toKey" type="K">
		</parameter>
		<parameter name="inclusive" type="boolean">
		</parameter>
		</method>
		<method name="headMap"
		return="java.util.SortedMap<K, V>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="toKey" type="K">
		</parameter>
		</method>
		<method name="higherEntry"
		return="java.util.Map.Entry<K, V>"
		abstract="true"
		@@ -343867,13 +344017,28 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="startKey" type="K">
		<parameter name="fromKey" type="K">
		</parameter>
		<parameter name="startInclusive" type="boolean">
		<parameter name="fromInclusive" type="boolean">
		</parameter>
		<parameter name="endKey" type="K">
		<parameter name="toKey" type="K">
		</parameter>
		<parameter name="endInclusive" type="boolean">
		<parameter name="toInclusive" type="boolean">
		</parameter>
		</method>
		<method name="subMap"
		return="java.util.SortedMap<K, V>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fromKey" type="K">
		</parameter>
		<parameter name="toKey" type="K">
		</parameter>
		</method>
		<method name="tailMap"
		@@ -343886,11 +344051,24 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="startKey" type="K">
		<parameter name="fromKey" type="K">
		</parameter>
		<parameter name="inclusive" type="boolean">
		</parameter>
		</method>
		<method name="tailMap"
		return="java.util.SortedMap<K, V>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fromKey" type="K">
		</parameter>
		</method>
		</interface>
		<interface name="NavigableSet"
		abstract="true"
		@@ -343959,9 +344137,22 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="end" type="E">
		<parameter name="toElement" type="E">
		</parameter>
		<parameter name="endInclusive" type="boolean">
		<parameter name="inclusive" type="boolean">
		</parameter>
		</method>
		<method name="headSet"
		return="java.util.SortedSet<E>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="toElement" type="E">
		</parameter>
		</method>
		<method name="higher"
		@@ -343977,6 +344168,17 @@
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="iterator"
		return="java.util.Iterator<E>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="lower"
		return="E"
		abstract="true"
		@@ -344022,13 +344224,28 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="start" type="E">
		<parameter name="fromElement" type="E">
		</parameter>
		<parameter name="startInclusive" type="boolean">
		<parameter name="fromInclusive" type="boolean">
		</parameter>
		<parameter name="end" type="E">
		<parameter name="toElement" type="E">
		</parameter>
		<parameter name="endInclusive" type="boolean">
		<parameter name="toInclusive" type="boolean">
		</parameter>
		</method>
		<method name="subSet"
		return="java.util.SortedSet<E>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fromElement" type="E">
		</parameter>
		<parameter name="toElement" type="E">
		</parameter>
		</method>
		<method name="tailSet"
		@@ -344041,9 +344258,22 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="start" type="E">
		<parameter name="fromElement" type="E">
		</parameter>
		<parameter name="startInclusive" type="boolean">
		<parameter name="inclusive" type="boolean">
		</parameter>
		</method>
		<method name="tailSet"
		return="java.util.SortedSet<E>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fromElement" type="E">
		</parameter>
		</method>
		</interface>
		@@ -344705,6 +344935,19 @@
		>
		<implements name="java.util.Collection">
		</implements>
		<method name="add"
		return="boolean"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="element"
		return="E"
		abstract="true"
		@@ -344726,7 +344969,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="E">
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="peek"