commit f047f2a8f49cd06d9cb94238861f4acce937d87b
author Sreeram Ramachandran <sreeram@google.com> Tue Apr 15 16:04:26 2014 -0700
committer Lorenzo Colitti <lorenzo@google.com> Wed May 14 03:56:33 2014 -0700
tree d100e856661d57ecdef654f09ab7da533c77a371
parent a7b9796345335e4906d98432a1d194fa242cd23e

Update netd API.

Remove:
- resetOldSockets from setDefaultNetId: netd takes care of this automatically.
- {add,remove}DnsServersForNetId: equivalent to "resolver setnetdns".

Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02

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

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 7a155a2..24af6b6 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1972,34 +1972,6 @@
     }
 
     @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<servers.length; i++) {
-            cmd.appendArg(servers[i]);
-        }
-        cmd.appendArg((domains == null ? "" : domains));
-
-        try {
-            mConnector.execute(cmd);
-        } catch (NativeDaemonConnectorException e) {
-            throw e.rethrowAsParcelableException();
-        }
-    }
-
-    @Override
     public void addRouteForNetId(int netId, RouteInfo routeInfo) {
         modifyRouteForNetId(netId, routeInfo, ADD);
     }
@@ -2058,11 +2030,11 @@
     }
 
     @Override
-    public void setDefaultNetId(int netId, boolean resetOldSockets) {
+    public void setDefaultNetId(int netId) {
         mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
 
         try {
-            mConnector.execute("network", "default", "set", netId, resetOldSockets);
+            mConnector.execute("network", "default", "set", netId);
         } catch (NativeDaemonConnectorException e) {
             throw e.rethrowAsParcelableException();
         }