commit f46600d074f55d1c77741852cd734e3126b43eca
author Erik Kline <ek@google.com> Fri Apr 01 16:28:28 2016 +0900
committer Erik Kline <ek@google.com> Wed Apr 06 12:22:47 2016 +0900
tree 9fb1e27ca0bd9db0afdc2267bf712a86c810a4a0
parent 49e2db1b10c8b8d6833c8c2d2d6dc7f100489fee

Make public the registerDefaultNetworkCallback API

Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f4efc92..18388b2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23452,6 +23452,7 @@
     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);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 521b853..051ed04 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25188,6 +25188,7 @@
     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);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 7ae0f97..fe7b4d3 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23517,6 +23517,7 @@
     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);

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index f0673ff..b452341 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3021,7 +3021,6 @@
      *
      * @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,