Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 1b7e4d5a to master

Browse Source 
Change-Id: Ib3f8e1bffb759dbe5ef5e681ac872e9a9b70c24e
This commit is contained in:
Brian Carlstrom
2010-08-05 14:02:36 -07:00
parent 507a4ea340 1b7e4d5adc
commit 92d249c57f
3 changed files with 2 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
api/9.xml
View File

@@ -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"

4
api/current.xml
View File

@@ -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>

3
preloaded-classes
View File

@@ -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