Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete dead code." am: cf59ff79c5

Browse Source 
am: d305a7c894

Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7
This commit is contained in:
Lorenzo Colitti
2017-01-17 06:02:30 +00:00
committed by android-build-merger
parent b1d4313777 d305a7c894
commit 8cf7169564
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/INetworkManagementService.aidl
View File

@@ -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);

25
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -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);