Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev

core/java/android/net/NetworkInfo.java

@@ -127,14 +127,6 @@ public class NetworkInfo implements Parcelable {
      */
     private boolean mIsAvailable;
 
-    /**
-     * @param type network type
-     * @deprecated
-     * @hide because this constructor was only meant for internal use (and
-     * has now been superseded by the package-private constructor below).
-     */
-    public NetworkInfo(int type) {}
-
     /**
      * @hide
      */

services/core/java/com/android/server/ConnectivityService.java

@@ -4816,7 +4816,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
             result.setType(networkType);
             return result;
         } else {
-            NetworkInfo result = new NetworkInfo(networkType);
+            NetworkInfo result = new NetworkInfo(
+                    networkType, 0, ConnectivityManager.getNetworkTypeName(networkType), "");
             result.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
             return result;
         }