Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bad3a9e6 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 

* commit '2d1e8c49':
  Only apply tcp buffer sizes for default net
parents 1efc6e52 2d1e8c49

services/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                }

            }