diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-05-12 16:32:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 16:32:29 +0000 |
| commit | 356a26122bf928709d88cdc9a4a304b4495b1b31 (patch) | |
| tree | 26fc500fb3315ecd5e99acdb8a9e82a05f829f98 | |
| parent | c7374318a69d4341235bd143b9fdae2cabcea3e9 (diff) | |
| parent | 9e59e12b8648116679d929f720893bf26a507f2b (diff) | |
| download | frameworks_base-356a26122bf928709d88cdc9a4a304b4495b1b31.zip frameworks_base-356a26122bf928709d88cdc9a4a304b4495b1b31.tar.gz frameworks_base-356a26122bf928709d88cdc9a4a304b4495b1b31.tar.bz2 | |
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 9b7042a..630b84f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18093,7 +18093,7 @@ package android.net { method public void ignoreNetworkWithCaptivePortal(android.net.Network, java.lang.String); method public boolean isActiveNetworkMetered(); method public boolean isDefaultNetworkActive(); - method public static boolean isNetworkTypeValid(int); + method public static deprecated boolean isNetworkTypeValid(int); 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); diff --git a/api/system-current.txt b/api/system-current.txt index 3f734ed..e606a00 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19570,7 +19570,7 @@ package android.net { method public void ignoreNetworkWithCaptivePortal(android.net.Network, java.lang.String); method public boolean isActiveNetworkMetered(); method public boolean isDefaultNetworkActive(); - method public static boolean isNetworkTypeValid(int); + method public static deprecated boolean isNetworkTypeValid(int); 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); diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index d8c3361..26878c0 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -496,6 +496,8 @@ public class ConnectivityManager { * Tests if a given integer represents a valid network type. * @param networkType the type to be tested * @return a boolean. {@code true} if the type is valid, else {@code false} + * @deprecated All APIs accepting a network type are deprecated. There should be no need to + * validate a network type. */ public static boolean isNetworkTypeValid(int networkType) { return networkType >= 0 && networkType <= MAX_NETWORK_TYPE; |