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

Commit ac12b84e authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Switch to positive naming for NetworkMonitor's Networks. 

"mNonPrivateDnsBypassNetwork" is not very easy to understand.

Bug: 122652057
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: If5801c81c6ef222b46f631bd6570dcd0fea465bd
parent 62f3e53f

packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java

+14 −13
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ public class NetworkMonitor extends StateMachine { 


    private final Context mContext;

    private final INetworkMonitorCallbacks mCallback;

    private final Network mCleartextDnsNetwork;

    private final Network mNetwork;

    private final Network mNonPrivateDnsBypassNetwork;

    private final TelephonyManager mTelephonyManager;

    private final WifiManager mWifiManager;

    private final ConnectivityManager mCm;
@@ -370,8 +370,8 @@ public class NetworkMonitor extends StateMachine { 
        mCallback = cb;

        mDependencies = deps;

        mDetectionStatsUtils = detectionStatsUtils;

        mNonPrivateDnsBypassNetwork = network;

        mNetwork = deps.getPrivateDnsBypassNetwork(network);

        mNetwork = network;

        mCleartextDnsNetwork = deps.getPrivateDnsBypassNetwork(network);

        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -496,7 +496,7 @@ public class NetworkMonitor extends StateMachine { 


    @Override

    protected void log(String s) {

        if (DBG) Log.d(TAG + "/" + mNetwork.toString(), s);

        if (DBG) Log.d(TAG + "/" + mCleartextDnsNetwork.toString(), s);

    }



    private void validationLog(int probeType, Object url, String msg) {
@@ -769,7 +769,7 @@ public class NetworkMonitor extends StateMachine { 
                case CMD_LAUNCH_CAPTIVE_PORTAL_APP:

                    final Bundle appExtras = new Bundle();

                    // OneAddressPerFamilyNetwork is not parcelable across processes.

                    final Network network = new Network(mNetwork);

                    final Network network = new Network(mCleartextDnsNetwork);

                    appExtras.putParcelable(ConnectivityManager.EXTRA_NETWORK, network);

                    final CaptivePortalProbeResult probeRes = mLastPortalProbeResult;

                    appExtras.putString(EXTRA_CAPTIVE_PORTAL_URL, probeRes.detectUrl);
@@ -881,7 +881,7 @@ public class NetworkMonitor extends StateMachine { 
        CustomIntentReceiver(String action, int token, int what) {

            mToken = token;

            mWhat = what;

            mAction = action + "_" + mNetwork.getNetworkHandle() + "_" + token;

            mAction = action + "_" + mCleartextDnsNetwork.getNetworkHandle() + "_" + token;

            mContext.registerReceiver(this, new IntentFilter(mAction));

        }

        public PendingIntent getPendingIntent() {
@@ -994,7 +994,8 @@ public class NetworkMonitor extends StateMachine { 
        private void resolveStrictModeHostname() {

            try {

                // Do a blocking DNS resolution using the network-assigned nameservers.

                final InetAddress[] ips = mNetwork.getAllByName(mPrivateDnsProviderHostname);

                final InetAddress[] ips = mCleartextDnsNetwork.getAllByName(

                        mPrivateDnsProviderHostname);

                mPrivateDnsConfig = new PrivateDnsConfig(mPrivateDnsProviderHostname, ips);

                validationLog("Strict mode hostname resolved: " + mPrivateDnsConfig);

            } catch (UnknownHostException uhe) {
@@ -1033,7 +1034,7 @@ public class NetworkMonitor extends StateMachine { 
                    + oneTimeHostnameSuffix;

            final Stopwatch watch = new Stopwatch().start();

            try {

                final InetAddress[] ips = mNonPrivateDnsBypassNetwork.getAllByName(host);

                final InetAddress[] ips = mNetwork.getAllByName(host);

                final long time = watch.stop();

                final String strIps = Arrays.toString(ips);

                final boolean success = (ips != null && ips.length > 0);
@@ -1506,7 +1507,7 @@ public class NetworkMonitor extends StateMachine { 


        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_PROBE);

        mDependencies.getDnsResolver().query(mNetwork, host, DnsResolver.FLAG_EMPTY,

        mDependencies.getDnsResolver().query(mCleartextDnsNetwork, host, DnsResolver.FLAG_EMPTY,

                r -> r.run() /* executor */, null /* cancellationSignal */, callback);

        TrafficStats.setThreadStatsTag(oldTag);
@@ -1565,7 +1566,7 @@ public class NetworkMonitor extends StateMachine { 
        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_PROBE);

        try {

            urlConnection = (HttpURLConnection) mNetwork.openConnection(url);

            urlConnection = (HttpURLConnection) mCleartextDnsNetwork.openConnection(url);

            urlConnection.setInstanceFollowRedirects(probeType == ValidationProbeEvent.PROBE_PAC);

            urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);

            urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS);
@@ -1814,7 +1815,7 @@ public class NetworkMonitor extends StateMachine { 


    private void logNetworkEvent(int evtype) {

        int[] transports = mNetworkCapabilities.getTransportTypes();

        mMetricsLog.log(mNetwork, transports, new NetworkEvent(evtype));

        mMetricsLog.log(mCleartextDnsNetwork, transports, new NetworkEvent(evtype));

    }



    private int networkEventType(ValidationStage s, EvaluationResult r) {
@@ -1836,7 +1837,7 @@ public class NetworkMonitor extends StateMachine { 
    private void maybeLogEvaluationResult(int evtype) {

        if (mEvaluationTimer.isRunning()) {

            int[] transports = mNetworkCapabilities.getTransportTypes();

            mMetricsLog.log(mNetwork, transports,

            mMetricsLog.log(mCleartextDnsNetwork, transports,

                    new NetworkEvent(evtype, mEvaluationTimer.stop()));

            mEvaluationTimer.reset();

        }
@@ -1850,7 +1851,7 @@ public class NetworkMonitor extends StateMachine { 
                .setReturnCode(probeResult)

                .setDurationMs(durationMs)

                .build();

        mMetricsLog.log(mNetwork, transports, ev);

        mMetricsLog.log(mCleartextDnsNetwork, transports, ev);

    }



    @VisibleForTesting

packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java

+13 −13
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ public class NetworkMonitorTest { 
    private @Mock Random mRandom;

    private @Mock NetworkMonitor.Dependencies mDependencies;

    private @Mock INetworkMonitorCallbacks mCallbacks;

    private @Spy Network mNetwork = new Network(TEST_NETID);

    private @Mock Network mNonPrivateDnsBypassNetwork;

    private @Spy Network mCleartextDnsNetwork = new Network(TEST_NETID);

    private @Mock Network mNetwork;

    private @Mock DataStallStatsUtils mDataStallStatsUtils;

    private @Mock WifiInfo mWifiInfo;

    private @Captor ArgumentCaptor<String> mNetworkTestedRedirectUrlCaptor;
@@ -191,7 +191,7 @@ public class NetworkMonitorTest { 


        /** Returns the answer for a given name on the given mock network. */

        private synchronized List<InetAddress> getAnswer(Object mock, String hostname) {

            if (mock == mNonPrivateDnsBypassNetwork && !mNonBypassPrivateDnsWorking) {

            if (mock == mNetwork && !mNonBypassPrivateDnsWorking) {

                return null;

            }

            if (mAnswers.containsKey(hostname)) {
@@ -226,17 +226,17 @@ public class NetworkMonitorTest { 


        /** Starts mocking DNS queries. */

        private void startMocking() throws UnknownHostException {

            // Queries on mNetwork (i.e., bypassing private DNS) using getAllByName.

            // Queries on mCleartextDnsNetwork using getAllByName.

            doAnswer(invocation -> {

                return getAllByName(invocation.getMock(), invocation.getArgument(0));

            }).when(mNetwork).getAllByName(any());

            }).when(mCleartextDnsNetwork).getAllByName(any());



            // Queries on mNonBypassPrivateDnsNetwork using getAllByName.

            // Queries on mNetwork using getAllByName.

            doAnswer(invocation -> {

                return getAllByName(invocation.getMock(), invocation.getArgument(0));

            }).when(mNonPrivateDnsBypassNetwork).getAllByName(any());

            }).when(mNetwork).getAllByName(any());



            // Queries on mNetwork (i.e., bypassing private DNS) using DnsResolver#query.

            // Queries on mCleartextDnsNetwork using DnsResolver#query.

            doAnswer(invocation -> {

                String hostname = (String) invocation.getArgument(1);

                Executor executor = (Executor) invocation.getArgument(3);
@@ -259,7 +259,7 @@ public class NetworkMonitorTest { 
    @Before

    public void setUp() throws IOException {

        MockitoAnnotations.initMocks(this);

        when(mDependencies.getPrivateDnsBypassNetwork(any())).thenReturn(mNetwork);

        when(mDependencies.getPrivateDnsBypassNetwork(any())).thenReturn(mCleartextDnsNetwork);

        when(mDependencies.getDnsResolver()).thenReturn(mDnsResolver);

        when(mDependencies.getRandom()).thenReturn(mRandom);

        when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_MODE), anyInt()))
@@ -271,7 +271,7 @@ public class NetworkMonitorTest { 
        when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_HTTPS_URL), any()))

                .thenReturn(TEST_HTTPS_URL);



        doReturn(mNetwork).when(mNonPrivateDnsBypassNetwork).getPrivateDnsBypassingCopy();

        doReturn(mCleartextDnsNetwork).when(mNetwork).getPrivateDnsBypassingCopy();



        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);

        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephony);
@@ -305,7 +305,7 @@ public class NetworkMonitorTest { 
                    fail("URL not mocked: " + url.toString());

                    return null;

            }

        }).when(mNetwork).openConnection(any());

        }).when(mCleartextDnsNetwork).openConnection(any());

        when(mHttpConnection.getRequestProperties()).thenReturn(new ArrayMap<>());

        when(mHttpsConnection.getRequestProperties()).thenReturn(new ArrayMap<>());
@@ -355,7 +355,7 @@ public class NetworkMonitorTest { 
        private final ConditionVariable mQuitCv = new ConditionVariable(false);



        WrappedNetworkMonitor() {

            super(mContext, mCallbacks, mNonPrivateDnsBypassNetwork, mLogger, mValidationLogger,

            super(mContext, mCallbacks, mNetwork, mLogger, mValidationLogger,

                    mDependencies, mDataStallStatsUtils);

        }
@@ -665,7 +665,7 @@ public class NetworkMonitorTest { 
    @Test

    public void testNoInternetCapabilityValidated() throws Exception {

        runNetworkTest(NO_INTERNET_CAPABILITIES, NETWORK_TEST_RESULT_VALID);

        verify(mNetwork, never()).openConnection(any());

        verify(mCleartextDnsNetwork, never()).openConnection(any());

    }



    @Test