Merge "Font API clean up" into oc-dev

[android-x86/frameworks-base.git] / api / system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index f49ab1d..c8b35d1 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -20765,9 +20765,9 @@ package android.icu.util {
     method protected final void computeGregorianFields(int);
     method protected int computeGregorianMonthStart(int, int);
     method protected int computeJulianDay();
-    method protected int computeMillisInDay();
+    method protected deprecated int computeMillisInDay();
     method protected void computeTime();
-    method protected int computeZoneOffset(long, int);
+    method protected deprecated int computeZoneOffset(long, int);
     method public int fieldDifference(java.util.Date, int);
     method protected java.lang.String fieldName(int);
     method protected static final long floorDivide(long, long);
@@ -42085,7 +42085,8 @@ package android.telecom {
 
   public static final class Call.RttCall {
     method public int getRttAudioMode();
-    method public java.lang.String read();
+    method public java.lang.String read() throws java.io.IOException;
+    method public java.lang.String readImmediately() throws java.io.IOException;
     method public void setRttMode(int);
     method public void write(java.lang.String) throws java.io.IOException;
     field public static final int RTT_MODE_FULL = 1; // 0x1
@@ -73912,6 +73913,7 @@ package javax.net.ssl {
   public abstract class SSLSocketFactory extends javax.net.SocketFactory {
     ctor public SSLSocketFactory();
     method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;
+    method public java.net.Socket createSocket(java.net.Socket, java.io.InputStream, boolean) throws java.io.IOException;
     method public static synchronized javax.net.SocketFactory getDefault();
     method public abstract java.lang.String[] getDefaultCipherSuites();
     method public abstract java.lang.String[] getSupportedCipherSuites();