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

Merge "Update netd API."

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-05-14 12:44:55 +00:00
committed by Android (Google) Code Review
parent 8f677677ec f047f2a8f4
commit 9bc300e98f
2 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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