From f46600d074f55d1c77741852cd734e3126b43eca Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Fri, 1 Apr 2016 16:28:28 +0900 Subject: [PATCH] Make public the registerDefaultNetworkCallback API Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/net/ConnectivityManager.java | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index f4efc92eb3d34..18388b2d3a7c4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/system-current.txt b/api/system-current.txt index 521b85382fb1e..051ed04fcdbc1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/api/test-current.txt b/api/test-current.txt index 7ae0f97d4b156..fe7b4d38a9e83 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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); diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index f0673fffc0d87..b4523412aa83e 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -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,