diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java index 664961046..886cb1d4d 100644 --- a/apps/Development/src/com/android/development/Connectivity.java +++ b/apps/Development/src/com/android/development/Connectivity.java @@ -33,7 +33,6 @@ import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.wifi.ScanResult; import android.net.wifi.WifiManager; @@ -85,7 +84,6 @@ import java.util.List; import java.util.Random; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; -import static android.net.ConnectivityManager.INET_CONDITION_ACTION; import static android.net.NetworkCapabilities.*; public class Connectivity extends Activity { @@ -280,28 +278,24 @@ public class Connectivity extends Activity { private static class DevToolsNetworkCallback extends NetworkCallback { private static final String TAG = "DevToolsNetworkCallback"; - public void onPreCheck(Network network) { - Log.d(TAG, "onPreCheck: " + network.netId); - } - public void onAvailable(Network network) { - Log.d(TAG, "onAvailable: " + network.netId); + Log.d(TAG, "onAvailable: " + network); } public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) { - Log.d(TAG, "onCapabilitiesChanged: " + network.netId + " " + nc.toString()); + Log.d(TAG, "onCapabilitiesChanged: " + network + " " + nc.toString()); } public void onLinkPropertiesChanged(Network network, LinkProperties lp) { - Log.d(TAG, "onLinkPropertiesChanged: " + network.netId + " " + lp.toString()); + Log.d(TAG, "onLinkPropertiesChanged: " + network + " " + lp.toString()); } public void onLosing(Network network, int maxMsToLive) { - Log.d(TAG, "onLosing: " + network.netId + " " + maxMsToLive); + Log.d(TAG, "onLosing: " + network + " " + maxMsToLive); } public void onLost(Network network) { - Log.d(TAG, "onLost: " + network.netId); + Log.d(TAG, "onLost: " + network); } } private DevToolsNetworkCallback mCallback; @@ -484,7 +478,6 @@ public class Connectivity extends Activity { IntentFilter broadcastFilter = new IntentFilter(); broadcastFilter.addAction(CONNECTIVITY_ACTION); broadcastFilter.addAction(CONNECTIVITY_TEST_ALARM); - broadcastFilter.addAction(INET_CONDITION_ACTION); broadcastFilter.addAction(NETWORK_CONDITIONS_MEASURED); registerReceiver(mReceiver, broadcastFilter);