Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev

This commit is contained in:
Erik Kline
2014-12-02 07:22:29 +00:00
committed by Android (Google) Code Review

View File

@@ -71,7 +71,6 @@ import libcore.net.event.NetworkEventDispatcher;
*/ */
public class ConnectivityManager { public class ConnectivityManager {
private static final String TAG = "ConnectivityManager"; private static final String TAG = "ConnectivityManager";
private static final boolean LEGACY_DBG = true; // STOPSHIP
/** /**
* A change in network connectivity has occurred. A default connection has either * A change in network connectivity has occurred. A default connection has either
@@ -880,14 +879,6 @@ public class ConnectivityManager {
NetworkRequest request = null; NetworkRequest request = null;
synchronized (sLegacyRequests) { synchronized (sLegacyRequests) {
if (LEGACY_DBG) {
Log.d(TAG, "Looking for legacyRequest for netCap with hash: " + netCap + " (" +
netCap.hashCode() + ")");
Log.d(TAG, "sLegacyRequests has:");
for (NetworkCapabilities nc : sLegacyRequests.keySet()) {
Log.d(TAG, " " + nc + " (" + nc.hashCode() + ")");
}
}
LegacyRequest l = sLegacyRequests.get(netCap); LegacyRequest l = sLegacyRequests.get(netCap);
if (l != null) { if (l != null) {
Log.d(TAG, "renewing startUsingNetworkFeature request " + l.networkRequest); Log.d(TAG, "renewing startUsingNetworkFeature request " + l.networkRequest);