diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-05 14:02:36 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-05 14:02:36 -0700 |
| commit | 92d249c57ffb8331860494f4ff403c805fdbc0dc (patch) | |
| tree | 15a38fa6c68a53ef6f35d4d6675d7f39f1e57b76 | |
| parent | 507a4ea34038daa521036d4c820288b3166a0ed5 (diff) | |
| parent | 1b7e4d5adcc2737bc11bfbf42a88a02d6df984e0 (diff) | |
| download | frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.zip frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.tar.gz frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.tar.bz2 | |
resolved conflicts for merge of 1b7e4d5a to master
Change-Id: Ib3f8e1bffb759dbe5ef5e681ac872e9a9b70c24e
| -rw-r--r-- | api/9.xml | 118 | ||||
| -rw-r--r-- | api/current.xml | 4 | ||||
| -rw-r--r-- | preloaded-classes | 3 |
3 files changed, 2 insertions, 123 deletions
@@ -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" diff --git a/api/current.xml b/api/current.xml index e183d23..7a9d251 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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> diff --git a/preloaded-classes b/preloaded-classes index 6a10bb3..33dba37 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -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 |