Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f047f2a8 authored by Sreeram Ramachandran's avatar Sreeram Ramachandran Committed by Lorenzo Colitti
Browse files

Update netd API. 

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

Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02
parent a7b97963

core/java/android/os/INetworkManagementService.aidl

+1 −4
Original line number Diff line number Diff line
@@ -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);

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

+2 −30
Original line number Diff line number Diff line
@@ -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<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 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



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

        }