diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2014-03-05 22:20:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:20:58 +0000 |
commit | 2d07e8d60e44e320b0c39d63e763d79a7befadf3 (patch) | |
tree | 3ae22e831f891e374e3eaba6d8c0d71cef6fb37d | |
parent | 943cdf7e221b867978416024526fe851c248972d (diff) | |
parent | c1ca3bac5d35a029003e839ccccf66b028739aaf (diff) | |
download | frameworks_base-2d07e8d60e44e320b0c39d63e763d79a7befadf3.zip frameworks_base-2d07e8d60e44e320b0c39d63e763d79a7befadf3.tar.gz frameworks_base-2d07e8d60e44e320b0c39d63e763d79a7befadf3.tar.bz2 |
am c1ca3bac: am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit 'c1ca3bac5d35a029003e839ccccf66b028739aaf':
Only apply tcp buffer sizes for default net
-rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 8d158cf..560ec54 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2312,9 +2312,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()); @@ -3041,7 +3041,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; } } |