From 939112e0064a5b11d5aed1478cfe08748b974bb7 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 29 Aug 2014 18:34:49 -0700 Subject: [PATCH] Kill the NetworkInfo(int type) constructor. IT'S A TRAP! This constructor does nothing, including doing nothing with its only argument. This causes it to return a NetworkInfo for TYPE_MOBILE no matter what was passed in. Bug: 16610051 Change-Id: I4ccd5ec050f7824fb06496c00fcd7901defeb7bd --- core/java/android/net/NetworkInfo.java | 8 -------- .../core/java/com/android/server/ConnectivityService.java | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/java/android/net/NetworkInfo.java b/core/java/android/net/NetworkInfo.java index d2794127f5..7664c959f6 100644 --- a/core/java/android/net/NetworkInfo.java +++ b/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 */ diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ef0b155b62..3bab1bfa33 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/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; }