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

Commit 643e60b0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge changes from topic "bindprocess-resolv" 

* changes:
  Allow use of bindProcessToNetwork only to change private DNS bypass.
  Allow bypassing private DNS via bindProcessToNetwork.
parents 4163ff79 e5ca1160

core/java/android/net/ConnectivityManager.java

+12 −6
Original line number Diff line number Diff line
@@ -4006,10 +4006,17 @@ public class ConnectivityManager { 
    @Deprecated

    public static boolean setProcessDefaultNetwork(@Nullable Network network) {

        int netId = (network == null) ? NETID_UNSET : network.netId;

        if (netId == NetworkUtils.getBoundNetworkForProcess()) {

            return true;

        boolean isSameNetId = (netId == NetworkUtils.getBoundNetworkForProcess());



        if (netId != NETID_UNSET) {

            netId = network.getNetIdForResolv();

        }



        if (!NetworkUtils.bindProcessToNetwork(netId)) {

            return false;

        }

        if (NetworkUtils.bindProcessToNetwork(netId)) {



        if (!isSameNetId) {

            // Set HTTP proxy system properties to match network.

            // TODO: Deprecate this static method and replace it with a non-static version.

            try {
@@ -4023,10 +4030,9 @@ public class ConnectivityManager { 
            // Must flush socket pool as idle sockets will be bound to previous network and may

            // cause subsequent fetches to be performed on old network.

            NetworkEventDispatcher.getInstance().onNetworkConfigurationChanged();

            return true;

        } else {

            return false;

        }



        return true;

    }



    /**