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

Commit a7153b1f authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Remove Settings.Global.TCP_DEFAULT_INIT_RWND on CS" am: 86203dde 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635043

Change-Id: Ia8fa547044f9674b1c465606e43c346ba0bc7c0e
parents 9236dc5f 86203dde

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

+0 −7
Original line number Diff line number Diff line
@@ -2653,13 +2653,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        } catch (RemoteException | ServiceSpecificException e) {

            loge("Can't set TCP buffer sizes:" + e);

        }



        final Integer rwndValue = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.TCP_DEFAULT_INIT_RWND,

                    mSystemProperties.getInt("net.tcp.default_init_rwnd", 0));

        if (rwndValue != 0) {

            mSystemProperties.setTcpInitRwnd(rwndValue);

        }

    }



    @Override

services/core/java/com/android/server/connectivity/MockableSystemProperties.java

+0 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.connectivity;



import android.os.SystemProperties;

import android.sysprop.NetworkProperties;



public class MockableSystemProperties {
@@ -32,10 +31,4 @@ public class MockableSystemProperties { 
    public boolean getBoolean(String key, boolean def) {

        return SystemProperties.getBoolean(key, def);

    }

    /**

     * Set net.tcp_def_init_rwnd to the tcp initial receive window size.

     */

    public void setTcpInitRwnd(int value) {

        NetworkProperties.tcp_init_rwnd(value);

    }

}

tests/net/java/com/android/server/ConnectivityServiceTest.java

+0 −6
Original line number Diff line number Diff line
@@ -1563,10 +1563,7 @@ public class ConnectivityServiceTest { 
    }















    private ConnectivityService.Dependencies makeDependencies() {













        doReturn(TEST_TCP_INIT_RWND).when(mSystemProperties)













                .getInt("net.tcp.default_init_rwnd", 0);















        doReturn(false).when(mSystemProperties).getBoolean("ro.radio.noril", false);













        doNothing().when(mSystemProperties).setTcpInitRwnd(anyInt());















        final ConnectivityService.Dependencies deps = mock(ConnectivityService.Dependencies.class);















        doReturn(mCsHandlerThread).when(deps).makeHandlerThread();















        doReturn(mNetIdManager).when(deps).makeNetIdManager();










@@ -8045,7 +8042,6 @@ public class ConnectivityServiceTest {



























        // Switching default network updates TCP buffer sizes.















        verifyTcpBufferSizeChange(ConnectivityService.DEFAULT_TCP_BUFFER_SIZES);













        verify(mSystemProperties, times(1)).setTcpInitRwnd(eq(TEST_TCP_INIT_RWND));















        // Add an IPv4 address. Expect prefix discovery to be stopped. Netd doesn't tell us that















        // the NAT64 prefix was removed because one was never discovered.















        cellLp.addLinkAddress(myIpv4);










@@ -8531,14 +8527,12 @@ public class ConnectivityServiceTest {













        mCellNetworkAgent.connect(false);















        networkCallback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);















        verifyTcpBufferSizeChange(ConnectivityService.DEFAULT_TCP_BUFFER_SIZES);













        verify(mSystemProperties, times(1)).setTcpInitRwnd(eq(TEST_TCP_INIT_RWND));















        // Change link Properties should have updated tcp buffer size.















        LinkProperties lp = new LinkProperties();















        lp.setTcpBufferSizes(testTcpBufferSizes);















        mCellNetworkAgent.sendLinkProperties(lp);















        networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent);















        verifyTcpBufferSizeChange(testTcpBufferSizes);













        verify(mSystemProperties, times(2)).setTcpInitRwnd(eq(TEST_TCP_INIT_RWND));















        // Clean up.















        mCellNetworkAgent.disconnect();















        networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);