diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-17 05:44:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-17 05:44:58 +0000 |
| commit | cf59ff79c54b405e87a58ed9a1dec9bf654b662a (patch) | |
| tree | 239433cc17bbb5b09906567fbff8e888ae5beba4 | |
| parent | 5511f7cfc262cedadcf892b0116d9ddf7c5b4a85 (diff) | |
| parent | 319146d3725cf39d818cb90e8ec16bb04449973e (diff) | |
| download | base-cf59ff79c54b405e87a58ed9a1dec9bf654b662a.tar.gz | |
Merge "Delete dead code."
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 25 |
2 files changed, 0 insertions, 30 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 1c3d6bdba861..dbe2f6d3283d 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 8f165049b431..158527d7a55c 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1905,31 +1905,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); Object[] argv = new Object[3 + MAX_UID_RANGES_PER_COMMAND]; |