diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-16 02:36:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 02:36:30 +0000 |
| commit | cb43ebb3604d45da8677b8d19c935f0ace08ea53 (patch) | |
| tree | caf1ac41223ad3999b134d49fcd62a7f6783b41b /api | |
| parent | 7400df9487151a9d53d00a0cc973a0164d22aecd (diff) | |
| parent | 80047faad914c9b9b4966d6b58fc22800c3fcebc (diff) | |
| download | frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.zip frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.tar.gz frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.tar.bz2 | |
Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 10 | ||||
| -rw-r--r-- | api/system-current.txt | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index e8d49c3..bea7d1b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6971,10 +6971,16 @@ package android.bluetooth { public final class BluetoothSocket implements java.io.Closeable { method public void close() throws java.io.IOException; method public void connect() throws java.io.IOException; + method public int getConnectionType(); method public java.io.InputStream getInputStream() throws java.io.IOException; + method public int getMaxReceivePacketSize(); + method public int getMaxTransmitPacketSize(); method public java.io.OutputStream getOutputStream() throws java.io.IOException; method public android.bluetooth.BluetoothDevice getRemoteDevice(); method public boolean isConnected(); + field public static final int TYPE_L2CAP = 3; // 0x3 + field public static final int TYPE_RFCOMM = 1; // 0x1 + field public static final int TYPE_SCO = 2; // 0x2 } } @@ -18108,6 +18114,7 @@ package android.net { public class ConnectivityManager { method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener); method public boolean bindProcessToNetwork(android.net.Network); + method public android.net.Network getActiveNetwork(); method public android.net.NetworkInfo getActiveNetworkInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.Network[] getAllNetworks(); @@ -18126,7 +18133,8 @@ package android.net { method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback); method public void releaseNetworkRequest(android.app.PendingIntent); method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener); - method public void reportBadNetwork(android.net.Network); + method public deprecated void reportBadNetwork(android.net.Network); + method public void reportNetworkConnectivity(android.net.Network, boolean); method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback); method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent); method public deprecated boolean requestRouteToHost(int, int); diff --git a/api/system-current.txt b/api/system-current.txt index 0bc83c3..c7d6a20 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7162,10 +7162,16 @@ package android.bluetooth { public final class BluetoothSocket implements java.io.Closeable { method public void close() throws java.io.IOException; method public void connect() throws java.io.IOException; + method public int getConnectionType(); method public java.io.InputStream getInputStream() throws java.io.IOException; + method public int getMaxReceivePacketSize(); + method public int getMaxTransmitPacketSize(); method public java.io.OutputStream getOutputStream() throws java.io.IOException; method public android.bluetooth.BluetoothDevice getRemoteDevice(); method public boolean isConnected(); + field public static final int TYPE_L2CAP = 3; // 0x3 + field public static final int TYPE_RFCOMM = 1; // 0x1 + field public static final int TYPE_SCO = 2; // 0x2 } } @@ -19566,6 +19572,7 @@ package android.net { public class ConnectivityManager { method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener); method public boolean bindProcessToNetwork(android.net.Network); + method public android.net.Network getActiveNetwork(); method public android.net.NetworkInfo getActiveNetworkInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.Network[] getAllNetworks(); @@ -19584,7 +19591,8 @@ package android.net { method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback); method public void releaseNetworkRequest(android.app.PendingIntent); method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener); - method public void reportBadNetwork(android.net.Network); + method public deprecated void reportBadNetwork(android.net.Network); + method public void reportNetworkConnectivity(android.net.Network, boolean); method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback); method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent); method public deprecated boolean requestRouteToHost(int, int); |