diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-09-03 16:41:45 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2015-09-03 17:53:42 -0700 |
| commit | a9ebeeff038ae5064dd36418ebfc07796ef58769 (patch) | |
| tree | d2f3058232046cbbd6489edb1708e96c5b4a780b | |
| parent | 1d5e2e291d4c3fbcde1425af74644a24c94e1577 (diff) | |
| download | frameworks_base-a9ebeeff038ae5064dd36418ebfc07796ef58769.zip frameworks_base-a9ebeeff038ae5064dd36418ebfc07796ef58769.tar.gz frameworks_base-a9ebeeff038ae5064dd36418ebfc07796ef58769.tar.bz2 | |
Cut down some logs.
bug:23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index d4e6c82..4055836 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2259,6 +2259,7 @@ public class ConnectivityManager { private final AtomicInteger mRefCount; private static final String TAG = "ConnectivityManager.CallbackHandler"; private final ConnectivityManager mCm; + private static final boolean DBG = false; CallbackHandler(Looper looper, HashMap<NetworkRequest, NetworkCallback>callbackMap, AtomicInteger refCount, ConnectivityManager cm) { @@ -2270,7 +2271,7 @@ public class ConnectivityManager { @Override public void handleMessage(Message message) { - Log.d(TAG, "CM callback handler got msg " + message.what); + if (DBG) Log.d(TAG, "CM callback handler got msg " + message.what); NetworkRequest request = (NetworkRequest) getObject(message, NetworkRequest.class); Network network = (Network) getObject(message, Network.class); switch (message.what) { diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 2bcee91..1f4427f 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -511,7 +511,6 @@ public class ConnectivityService extends IConnectivityManager.Stub ArrayList<NetworkAgentInfo> list = mTypeLists[type]; if (list.contains(nai)) { - loge("Attempting to register duplicate agent for type " + type + ": " + nai); return; } @@ -4280,7 +4279,7 @@ public class ConnectivityService extends IConnectivityManager.Stub boolean keep = newNetwork.isVPN(); boolean isNewDefault = false; NetworkAgentInfo oldDefaultNetwork = null; - if (DBG) log("rematching " + newNetwork.name()); + if (VDBG) log("rematching " + newNetwork.name()); // Find and migrate to this Network any NetworkRequests for // which this network is now the best. ArrayList<NetworkAgentInfo> affectedNetworks = new ArrayList<NetworkAgentInfo>(); @@ -4317,6 +4316,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } if (currentNetwork == null || currentNetwork.getCurrentScore() < newNetwork.getCurrentScore()) { + if (DBG) log("rematch for " + newNetwork.name()); if (currentNetwork != null) { if (DBG) log(" accepting network in place of " + currentNetwork.name()); currentNetwork.networkRequests.remove(nri.request.requestId); |