LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am a59ee3ac: am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev

Browse Source 
* commit 'a59ee3ac094d9d2a1c38852bc824d20f8166e28a':
  Cut down some logs.
This commit is contained in:
Robert Greenwalt
2015-09-06 23:08:25 +00:00
committed by Android Git Automerger
parent 43b0bcbe25 72877c2493
commit 72c6951953
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/ConnectivityManager.java
View File

@@ -2259,6 +2259,7 @@ public class ConnectivityManager {
private final AtomicInteger mRefCount; private final AtomicInteger mRefCount;
private static final String TAG = "ConnectivityManager.CallbackHandler"; private static final String TAG = "ConnectivityManager.CallbackHandler";
private final ConnectivityManager mCm; private final ConnectivityManager mCm;
private static final boolean DBG = false;
CallbackHandler(Looper looper, HashMap<NetworkRequest, NetworkCallback>callbackMap, CallbackHandler(Looper looper, HashMap<NetworkRequest, NetworkCallback>callbackMap,
AtomicInteger refCount, ConnectivityManager cm) { AtomicInteger refCount, ConnectivityManager cm) {
@@ -2270,7 +2271,7 @@ public class ConnectivityManager {
@Override @Override
public void handleMessage(Message message) { 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); NetworkRequest request = (NetworkRequest) getObject(message, NetworkRequest.class);
Network network = (Network) getObject(message, Network.class); Network network = (Network) getObject(message, Network.class);
switch (message.what) { switch (message.what) {

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -511,7 +511,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
ArrayList<NetworkAgentInfo> list = mTypeLists[type]; ArrayList<NetworkAgentInfo> list = mTypeLists[type];
if (list.contains(nai)) { if (list.contains(nai)) {
loge("Attempting to register duplicate agent for type " + type + ": " + nai);
return; return;
} }
@@ -4280,7 +4279,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
boolean keep = newNetwork.isVPN(); boolean keep = newNetwork.isVPN();
boolean isNewDefault = false; boolean isNewDefault = false;
NetworkAgentInfo oldDefaultNetwork = null; NetworkAgentInfo oldDefaultNetwork = null;
if (DBG) log("rematching " + newNetwork.name()); if (VDBG) log("rematching " + newNetwork.name());
// Find and migrate to this Network any NetworkRequests for // Find and migrate to this Network any NetworkRequests for
// which this network is now the best. // which this network is now the best.
ArrayList<NetworkAgentInfo> affectedNetworks = new ArrayList<NetworkAgentInfo>(); ArrayList<NetworkAgentInfo> affectedNetworks = new ArrayList<NetworkAgentInfo>();
@@ -4317,6 +4316,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
if (currentNetwork == null || if (currentNetwork == null ||
currentNetwork.getCurrentScore() < newNetwork.getCurrentScore()) { currentNetwork.getCurrentScore() < newNetwork.getCurrentScore()) {
if (DBG) log("rematch for " + newNetwork.name());
if (currentNetwork != null) { if (currentNetwork != null) {
if (DBG) log(" accepting network in place of " + currentNetwork.name()); if (DBG) log(" accepting network in place of " + currentNetwork.name());
currentNetwork.networkRequests.remove(nri.request.requestId); currentNetwork.networkRequests.remove(nri.request.requestId);