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

Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev

Browse Source 
am: 3671285

* commit '36712853a9d0b57702ee5b1fd936ff0b9f48c151':
  Make public the registerDefaultNetworkCallback API

Change-Id: I35035f991a45ec700530a83cc9cc89145ebb0bb6
This commit is contained in:
Erik Kline
2016-04-06 08:55:52 +00:00
committed by android-build-merger
parent e2a06f2f26 36712853a9
commit a577a3a29f
4 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -23452,6 +23452,7 @@ package android.net {
method public boolean isActiveNetworkMetered();
method public boolean isDefaultNetworkActive();
method public static deprecated boolean isNetworkTypeValid(int);
method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);
method public void releaseNetworkRequest(android.app.PendingIntent);

1
api/system-current.txt
View File

@@ -25188,6 +25188,7 @@ package android.net {
method public boolean isDefaultNetworkActive();
method public static deprecated boolean isNetworkTypeValid(int);
method public boolean isTetheringSupported();
method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);
method public void releaseNetworkRequest(android.app.PendingIntent);

1
api/test-current.txt
View File

@@ -23517,6 +23517,7 @@ package android.net {
method public boolean isActiveNetworkMetered();
method public boolean isDefaultNetworkActive();
method public static deprecated boolean isNetworkTypeValid(int);
method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);
method public void releaseNetworkRequest(android.app.PendingIntent);

1
core/java/android/net/ConnectivityManager.java
View File

@@ -3021,7 +3021,6 @@ public class ConnectivityManager {
*
* @param networkCallback The {@link NetworkCallback} that the system will call as the
* system default network changes.
* @hide
*/
public void registerDefaultNetworkCallback(NetworkCallback networkCallback) {
// This works because if the NetworkCapabilities are null,