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

Commit 319146d3 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Delete dead code. 

Since N, DNS servers are not set by setDnsServersForNetwork, they
they are set by setDnsConfigurationForNetwork.

Test: compiles
Bug: 30944031
Change-Id: I3a3edb9ffe9d5f9652af0b6637eb89b1b044a270
parent eef38717

core/java/android/os/INetworkManagementService.aidl

+0 −5
Original line number Diff line number Diff line
@@ -312,11 +312,6 @@ interface INetworkManagementService 
     */

    void setDnsConfigurationForNetwork(int netId, in String[] servers, String domains);



    /**

     * Bind name servers to a network in the DNS resolver.

     */

    void setDnsServersForNetwork(int netId, in String[] servers, String domains);



    void setFirewallEnabled(boolean enabled);

    boolean isFirewallEnabled();

    void setFirewallInterfaceRule(String iface, boolean allow);

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

+0 −25
Original line number Diff line number Diff line
@@ -1904,31 +1904,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

    }



    @Override

    public void setDnsServersForNetwork(int netId, String[] servers, String domains) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        Command cmd;

        if (servers.length > 0) {

            cmd = new Command("resolver", "setnetdns", netId,

                    (domains == null ? "" : domains));

            for (String s : servers) {

                InetAddress a = NetworkUtils.numericToInetAddress(s);

                if (a.isAnyLocalAddress() == false) {

                    cmd.appendArg(a.getHostAddress());

                }

            }

        } else {

            cmd = new Command("resolver", "clearnetdns", netId);

        }



        try {

            mConnector.execute(cmd);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

        }

    }



    @Override

    public void addVpnUidRanges(int netId, UidRange[] ranges) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);