Merge "ConnectivityManager: allow usage of TYPE_NONE"

am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

diff --cc core/java/android/net/ConnectivityManager.java
index 511466a,55127a8..d914823
--- 1/core/java/android/net/ConnectivityManager.java
--- 2/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@@ -638,9 -637,8 +640,9 @@@ public class ConnectivityManager 
       * @deprecated All APIs accepting a network type are deprecated. There should be no need to
       *             validate a network type.
       */
 +    @Deprecated
      public static boolean isNetworkTypeValid(int networkType) {
-         return networkType >= 0 && networkType <= MAX_NETWORK_TYPE;
+         return MIN_NETWORK_TYPE <= networkType && networkType <= MAX_NETWORK_TYPE;
      }
  
      /**

diff --cc core/java/android/net/NetworkCapabilities.java
index bf7207c,76646b8..400a9ad
--- 1/core/java/android/net/NetworkCapabilities.java
--- 2/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@@ -421,8 -422,19 +422,13 @@@ public final class NetworkCapabilities 
      /** @hide */
      public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
      /** @hide */
 -    public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN;
 +    public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;
  
+     /** @hide */
+     public static boolean isValidTransport(int transportType) {
+         return (MIN_TRANSPORT <= transportType) && (transportType <= MAX_TRANSPORT);
+     }
+ 
      private static final String[] TRANSPORT_NAMES = {
          "CELLULAR",
          "WIFI",

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge