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

Commit 9570e7da authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

resolve merge conflicts of 6c3cd444 to oc-dev-plus-aosp 

Test: make -j64 framework services FrameworksNetTests
Change-Id: Ib828e56b271cd983ef325e366418ca8db9774628
parents f22c3cd1 6c3cd444

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

+17 −13
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;
@@ -208,6 +207,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    // See Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS

    private final int mReleasePendingIntentDelayMs;



    private MockableSystemProperties mSystemProperties;



    private Tethering mTethering;



    private final PermissionMonitor mPermissionMonitor;
@@ -691,6 +692,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            IpConnectivityLog logger) {

        if (DBG) log("ConnectivityService starting up");



        mSystemProperties = getSystemProperties();



        mMetricsLog = logger;

        mDefaultRequest = createInternetRequestForTransport(-1, NetworkRequest.Type.REQUEST);

        NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());
@@ -708,7 +711,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mReleasePendingIntentDelayMs = Settings.Secure.getInt(context.getContentResolver(),

                Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, 5_000);



        mLingerDelayMs = SystemProperties.getInt(LINGER_DELAY_PROPERTY, DEFAULT_LINGER_DELAY_MS);

        mLingerDelayMs = mSystemProperties.getInt(LINGER_DELAY_PROPERTY, DEFAULT_LINGER_DELAY_MS);



        mContext = checkNotNull(context, "missing Context");

        mNetd = checkNotNull(netManager, "missing INetworkManagementService");
@@ -735,7 +738,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mNetConfigs = new NetworkConfig[ConnectivityManager.MAX_NETWORK_TYPE+1];



        // TODO: What is the "correct" way to do determine if this is a wifi only device?

        boolean wifiOnly = SystemProperties.getBoolean("ro.radio.noril", false);

        boolean wifiOnly = mSystemProperties.getBoolean("ro.radio.noril", false);

        log("wifiOnly=" + wifiOnly);

        String[] naStrings = context.getResources().getStringArray(

                com.android.internal.R.array.networkAttributes);
@@ -788,8 +791,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            }

        }



        mTestMode = SystemProperties.get("cm.test.mode").equals("true")

                && SystemProperties.get("ro.build.type").equals("eng");

        mTestMode = mSystemProperties.get("cm.test.mode").equals("true")

                && mSystemProperties.get("ro.build.type").equals("eng");



        mTethering = new Tethering(mContext, mNetd, statsService, mPolicyManager,

                                   IoThread.get().getLooper(), new MockableSystemProperties());
@@ -1814,8 +1817,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    // Overridden for testing purposes to avoid writing to SystemProperties.

    @VisibleForTesting

    protected int getDefaultTcpRwnd() {

        return SystemProperties.getInt(DEFAULT_TCP_RWND_KEY, 0);

    protected MockableSystemProperties getSystemProperties() {

        return new MockableSystemProperties();

    }



    private void updateTcpBufferSizes(NetworkAgentInfo nai) {
@@ -1853,10 +1856,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }



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

            Settings.Global.TCP_DEFAULT_INIT_RWND, getDefaultTcpRwnd());

            Settings.Global.TCP_DEFAULT_INIT_RWND,

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

        final String sysctlKey = "sys.sysctl.tcp_def_init_rwnd";

        if (rwndValue != 0) {

            SystemProperties.set(sysctlKey, rwndValue.toString());

            mSystemProperties.set(sysctlKey, rwndValue.toString());

        }

    }
@@ -1880,7 +1884,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    public int getRestoreDefaultNetworkDelay(int networkType) {

        String restoreDefaultNetworkDelayStr = SystemProperties.get(

        String restoreDefaultNetworkDelayStr = mSystemProperties.get(

                NETWORK_RESTORE_DELAY_PROP_NAME);

        if(restoreDefaultNetworkDelayStr != null &&

                restoreDefaultNetworkDelayStr.length() != 0) {
@@ -3081,7 +3085,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    public boolean isTetheringSupported() {

        enforceTetherAccessPermission();

        int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);

        int defaultVal = (mSystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);

        boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)

                && !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);
@@ -4580,11 +4584,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            ++last;

            String key = "net.dns" + last;

            String value = dns.getHostAddress();

            SystemProperties.set(key, value);

            mSystemProperties.set(key, value);

        }

        for (int i = last + 1; i <= mNumDnsEntries; ++i) {

            String key = "net.dns" + i;

            SystemProperties.set(key, "");

            mSystemProperties.set(key, "");

        }

        mNumDnsEntries = last;

    }

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

+13 −0
Original line number Diff line number Diff line
@@ -19,7 +19,20 @@ package com.android.server.connectivity; 
import android.os.SystemProperties;



public class MockableSystemProperties {



    public String get(String key) {

        return SystemProperties.get(key);

    }



    public int getInt(String key, int def) {

        return SystemProperties.getInt(key, def);

    }



    public boolean getBoolean(String key, boolean def) {

        return SystemProperties.getBoolean(key, def);

    }



    public void set(String key, String value) {

        SystemProperties.set(key, value);

    }

}

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

+43 −3
Original line number Diff line number Diff line
@@ -23,7 +23,12 @@ import static android.net.ConnectivityManager.TYPE_WIFI; 
import static android.net.ConnectivityManager.getNetworkTypeName;

import static android.net.NetworkCapabilities.*;



import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.app.NotificationManager;

import android.app.PendingIntent;
@@ -33,6 +38,7 @@ import android.content.Context; 
import android.content.ContextWrapper;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.ConnectivityManager.PacketKeepalive;
@@ -76,11 +82,16 @@ import android.util.LogPrinter; 
import com.android.internal.util.WakeupMessage;

import com.android.internal.util.test.BroadcastInterceptingContext;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.server.connectivity.MockableSystemProperties;

import com.android.server.connectivity.NetworkAgentInfo;

import com.android.server.connectivity.NetworkMonitor;

import com.android.server.connectivity.NetworkMonitor.CaptivePortalProbeResult;

import com.android.server.net.NetworkPinner;



import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.Spy;



import java.net.InetAddress;

import java.util.ArrayList;

import java.util.Arrays;
@@ -133,8 +144,19 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
    private class MockContext extends BroadcastInterceptingContext {

        private final MockContentResolver mContentResolver;



        @Spy private Resources mResources;



        MockContext(Context base) {

            super(base);



            mResources = spy(base.getResources());

            when(mResources.getStringArray(com.android.internal.R.array.networkAttributes)).

                    thenReturn(new String[] {

                            "wifi,1,1,1,-1,true",

                            "mobile,0,0,0,-1,true",

                            "mobile_mms,2,0,2,60000,true",

                    });



            mContentResolver = new MockContentResolver();

            mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        }
@@ -150,6 +172,11 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        public ContentResolver getContentResolver() {

            return mContentResolver;

        }



        @Override

        public Resources getResources() {

            return mResources;

        }

    }



    /**
@@ -620,6 +647,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
    private class WrappedConnectivityService extends ConnectivityService {

        public WrappedMultinetworkPolicyTracker wrappedMultinetworkPolicyTracker;

        private WrappedNetworkMonitor mLastCreatedNetworkMonitor;

        private MockableSystemProperties mSystemProperties;



        public WrappedConnectivityService(Context context, INetworkManagementService netManager,

                INetworkStatsService statsService, INetworkPolicyManager policyManager,
@@ -629,9 +657,13 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        }



        @Override

        protected int getDefaultTcpRwnd() {

            // Prevent wrapped ConnectivityService from trying to write to SystemProperties.

            return 0;

        protected MockableSystemProperties getSystemProperties() {

            // Minimal approach to overriding system properties: let most calls fall through to real

            // device values, and only override ones values that are important to this test.

            mSystemProperties = spy(new MockableSystemProperties());

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

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

            return mSystemProperties;

        }



        @Override
@@ -801,6 +833,14 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        return cv;

    }



    public void testNetworkTypes() {

        // Ensure that our mocks for the networkAttributes config variable work as expected. If they

        // don't, then tests that depend on CONNECTIVITY_ACTION broadcasts for these network types

        // will fail. Failing here is much easier to debug.

        assertTrue(mCm.isNetworkSupported(TYPE_WIFI));

        assertTrue(mCm.isNetworkSupported(TYPE_MOBILE));

    }



    @SmallTest

    public void testLingering() throws Exception {

        verifyNoNetwork();