drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only apply tcp buffer sizes for default net" into klp-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-03-05 18:23:56 +00:00
committed by Android (Google) Code Review
parent 1d13f13dea 30a2bc87d4
commit 2d1e8c4958
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2305,9 +2305,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mInetConditionChangeInFlight = false; mInetConditionChangeInFlight = false;
// Don't do this - if we never sign in stay, grey // Don't do this - if we never sign in stay, grey
//reportNetworkCondition(mActiveDefaultNetwork, 100); //reportNetworkCondition(mActiveDefaultNetwork, 100);
updateNetworkSettings(thisNet);
} }
thisNet.setTeardownRequested(false); thisNet.setTeardownRequested(false);
updateNetworkSettings(thisNet);
updateMtuSizeSettings(thisNet); updateMtuSizeSettings(thisNet);
handleConnectivityChange(newNetType, false); handleConnectivityChange(newNetType, false);
sendConnectedBroadcastDelayed(info, getConnectivityChangeDelay()); sendConnectedBroadcastDelayed(info, getConnectivityChangeDelay());
@ -3034,7 +3034,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
case NetworkStateTracker.EVENT_NETWORK_SUBTYPE_CHANGED: { case NetworkStateTracker.EVENT_NETWORK_SUBTYPE_CHANGED: {
info = (NetworkInfo) msg.obj; info = (NetworkInfo) msg.obj;
int type = info.getType(); int type = info.getType();
updateNetworkSettings(mNetTrackers[type]); if (mNetConfigs[type].isDefault()) updateNetworkSettings(mNetTrackers[type]);
break; break;
} }
} }