From 319146d3725cf39d818cb90e8ec16bb04449973e Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 16 Dec 2016 00:04:33 +0900 Subject: [PATCH] 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 --- .../android/os/INetworkManagementService.aidl | 5 ---- .../server/NetworkManagementService.java | 25 ------------------- 2 files changed, 30 deletions(-) diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 1c3d6bdba861e..dbe2f6d3283d8 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -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); diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 8f165049b4311..158527d7a55c9 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -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);