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

Commit 777022e2 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add NetworkStack networking deps to SystemApi 

Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug: 112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9
parent e1f80469

src/android/net/ip/IpClient.java

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.net.INetd; 
import android.net.IpPrefix;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.Network;

import android.net.ProvisioningConfigurationParcelable;

import android.net.ProxyInfo;

import android.net.ProxyInfoParcelable;
@@ -1000,7 +999,9 @@ public class IpClient extends StateMachine { 
        // mDhcpResults is never shared with any other owner so we don't have

        // to worry about concurrent modification.

        if (mDhcpResults != null) {

            for (RouteInfo route : mDhcpResults.getRoutes(mInterfaceName)) {

            final List<RouteInfo> routes =

                    mDhcpResults.toStaticIpConfiguration().getRoutes(mInterfaceName);

            for (RouteInfo route : routes) {

                newLp.addRoute(route);

            }

            addAllReachableDnsServers(newLp, mDhcpResults.dnsServers);

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

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ import java.net.URL; 
import java.net.UnknownHostException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.LinkedHashMap;

import java.util.List;
@@ -1146,7 +1147,10 @@ public class NetworkMonitor extends StateMachine { 
                return null;

            }



            return CaptivePortalProbeSpec.parseCaptivePortalProbeSpecs(settingsValue);

            final Collection<CaptivePortalProbeSpec> specs =

                    CaptivePortalProbeSpec.parseCaptivePortalProbeSpecs(settingsValue);

            final CaptivePortalProbeSpec[] specsArray = new CaptivePortalProbeSpec[specs.size()];

            return specs.toArray(specsArray);

        } catch (Exception e) {

            // Don't let a misconfiguration bootloop the system.

            Log.e(TAG, "Error parsing configured fallback probe specs", e);