From 9e59e12b8648116679d929f720893bf26a507f2b Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Wed, 6 May 2015 10:42:25 -0400
Subject: [PATCH] Deprecate ConnectivityManager.isNetworkTypeValid as it's
 unneeded.

All ConnectivityManager APIs taking a network type have been
deprecated so there should be no need to validate a network type.

bug:20647016
Change-Id: I2dcf24f58016e94aa814dda38cfc848366cc461c
---
 api/current.txt                                | 2 +-
 api/system-current.txt                         | 2 +-
 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 c8057db567649..68190b301f354 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18361,7 +18361,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 5222a0375249a..3b8c51ee3b6e3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19829,7 +19829,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 d8c3361be7cbf..26878c04f9e3f 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;