resolved conflicts for merge of 1b7e4d5a to master (92d249c5) · Commits · e / os / android_frameworks_base

api/9.xml

+0 −118

Original line number	Diff line number	Diff line
		@@ -303584,8 +303584,6 @@
		</implements>
		<implements name="java.io.Serializable">
		</implements>
		<implements name="java.util.SortedSet">
		</implements>
		<constructor name="TreeSet"
		type="java.util.TreeSet"
		static="false"
		@@ -306943,10 +306941,6 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="java.util.concurrent.Future">
		</implements>
		<implements name="java.lang.Runnable">
		</implements>
		<constructor name="FutureTask"
		type="java.util.concurrent.FutureTask"
		static="false"
		@@ -339917,32 +339911,6 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="getLogWriter"
		return="java.io.PrintWriter"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="getLoginTimeout"
		return="int"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="getPooledConnection"
		return="javax.sql.PooledConnection"
		abstract="true"
		@@ -339973,36 +339941,6 @@
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="setLogWriter"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="theWriter" type="java.io.PrintWriter">
		</parameter>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="setLoginTimeout"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="theTimeout" type="int">
		</parameter>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		</interface>
		<interface name="DataSource"
		abstract="true"
		@@ -340041,62 +339979,6 @@
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="getLogWriter"
		return="java.io.PrintWriter"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="getLoginTimeout"
		return="int"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="setLogWriter"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="theWriter" type="java.io.PrintWriter">
		</parameter>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		<method name="setLoginTimeout"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="theTimeout" type="int">
		</parameter>
		<exception name="SQLException" type="java.sql.SQLException">
		</exception>
		</method>
		</interface>
		<interface name="PooledConnection"
		abstract="true"

api/current.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -272163,7 +272163,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="loop" type="boolean">
		<parameter name="disable" type="boolean">
		</parameter>
		<exception name="SocketException" type="java.net.SocketException">
		</exception>
		@@ -273722,7 +273722,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="value" type="boolean">
		<parameter name="keepAlive" type="boolean">
		</parameter>
		<exception name="SocketException" type="java.net.SocketException">
		</exception>

preloaded-classes

+0 −3

Original line number	Diff line number	Diff line
		@@ -697,8 +697,6 @@ com.ibm.icu4jni.charset.CharsetEncoderICU
		com.ibm.icu4jni.charset.CharsetICU
		com.ibm.icu4jni.charset.NativeConverter
		com.ibm.icu4jni.common.ErrorCode
		com.ibm.icu4jni.lang.UCharacter
		com.ibm.icu4jni.regex.NativeRegEx
		com.ibm.icu4jni.text.Collator
		com.ibm.icu4jni.text.NativeBreakIterator
		com.ibm.icu4jni.text.NativeCollation
		@@ -1168,7 +1166,6 @@ org.apache.harmony.security.x509.SubjectPublicKeyInfo
		org.apache.harmony.security.x509.TBSCertificate
		org.apache.harmony.security.x509.Time
		org.apache.harmony.security.x509.Validity
		org.apache.harmony.text.BidiWrapper
		org.apache.harmony.xml.ExpatAttributes
		org.apache.harmony.xml.ExpatParser
		org.apache.harmony.xml.ExpatPullParser