diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index bdc520eb2a1f9..db9bebfd6af7f 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -431,16 +431,13 @@ interface INetworkManagementService */ void removeNetwork(int netId); - void addDnsServersForNetId(int netId, in String[] servers, in String domains); - void removeDnsServersForNetId(int netId, in String[] servers, in String domains); - void addRouteForNetId(int netId, in RouteInfo routeInfo); void removeRouteForNetId(int netId, in RouteInfo routeInfo); void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid); void removeLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid); - void setDefaultNetId(int netId, boolean resetOldSockets); + void setDefaultNetId(int netId); void clearDefaultNetId(); void setPermission(boolean internal, boolean changeNetState, in int[] uids); diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 7a155a21643a2..24af6b61f9f2a 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1971,34 +1971,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub } } - @Override - public void addDnsServersForNetId(int netId, String[] servers, String domains) { - modifyDnsServersForNetId(netId, servers, domains, ADD); - } - - @Override - public void removeDnsServersForNetId(int netId, String[] servers, - String domains) { - modifyDnsServersForNetId(netId, servers, domains, REMOVE); - } - - private void modifyDnsServersForNetId(int netId, String[] servers, - String domains, String action) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - - final Command cmd = new Command("network", "dns", action, netId, servers.length); - for(int i=0; i