diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-03-05 22:17:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:17:24 +0000 |
| commit | c1ca3bac5d35a029003e839ccccf66b028739aaf (patch) | |
| tree | 4f4a3291dcd581ce4defda8bc868e5c8fffb5c7a /services/core/java | |
| parent | 777b8a808ee76401429f7210ebb7194632040d45 (diff) | |
| parent | bf9eec4c3bbbacd0954d819c18709962a81338bf (diff) | |
| download | frameworks_base-c1ca3bac5d35a029003e839ccccf66b028739aaf.zip frameworks_base-c1ca3bac5d35a029003e839ccccf66b028739aaf.tar.gz frameworks_base-c1ca3bac5d35a029003e839ccccf66b028739aaf.tar.bz2 | |
am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit 'bf9eec4c3bbbacd0954d819c18709962a81338bf':
Only apply tcp buffer sizes for default net
Diffstat (limited to 'services/core/java')
| -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; } } |