summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2014-02-28 16:44:00 -0800
committer Robert Greenwalt <rgreenwalt@google.com> 2014-03-04 09:56:05 -0800
commit30a2bc87d42d13bdab3a334845e83dc5b9d05cb0 (patch)
treea4124a70d6b0f1b4d36a33a06fa5114ae4f8189b
parent81479358decb0a2cefbb8245e0f56ed0e966d697 (diff)
Only apply tcp buffer sizes for default net
This may mean that secondary networks have bad network settings, but currently default settings are overriden by secondary nets which seems worse. bug:13211589 Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226
-rw-r--r--services/java/com/android/server/ConnectivityService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index baff66117088..2d0c2856f81b 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2305,9 +2305,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mInetConditionChangeInFlight = false;
// Don't do this - if we never sign in stay, grey
//reportNetworkCondition(mActiveDefaultNetwork, 100);
+ updateNetworkSettings(thisNet);
}
thisNet.setTeardownRequested(false);
- updateNetworkSettings(thisNet);
updateMtuSizeSettings(thisNet);
handleConnectivityChange(newNetType, false);
sendConnectedBroadcastDelayed(info, getConnectivityChangeDelay());
@@ -3034,7 +3034,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
case NetworkStateTracker.EVENT_NETWORK_SUBTYPE_CHANGED: {
info = (NetworkInfo) msg.obj;
int type = info.getType();
- updateNetworkSettings(mNetTrackers[type]);
+ if (mNetConfigs[type].isDefault()) updateNetworkSettings(mNetTrackers[type]);
break;
}
}