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

am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

Browse Source 
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
This commit is contained in:
Chad Brubaker
2014-03-21 21:02:43 +00:00
committed by Android Git Automerger
parent 1d77a8741c 1fce89d946
commit c772614714
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,7 +420,7 @@ interface INetworkManagementService
/**
* Clear a user range from being associated with an interface.
*/
void clearDnsInterfaceForUidRange(int uid_start, int uid_end);
void clearDnsInterfaceForUidRange(String iface, int uid_start, int uid_end);
/**
* Clear the mappings from pid to Dns interface and from uid range to Dns interface.

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3914,7 +3914,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
boolean forwardDns) {
try {
mNetd.clearUidRangeRoute(interfaze, uidStart, uidEnd);
if (forwardDns) mNetd.clearDnsInterfaceForUidRange(uidStart, uidEnd);
if (forwardDns) mNetd.clearDnsInterfaceForUidRange(interfaze, uidStart, uidEnd);
} catch (RemoteException e) {
}

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

@@ -1601,10 +1601,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub
}
@Override
public void clearDnsInterfaceForUidRange(int uid_start, int uid_end) {
public void clearDnsInterfaceForUidRange(String iface, int uid_start, int uid_end) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
try {
mConnector.execute("resolver", "clearifaceforuidrange", uid_start, uid_end);
mConnector.execute("resolver", "clearifaceforuidrange", iface, uid_start, uid_end);
} catch (NativeDaemonConnectorException e) {
throw e.rethrowAsParcelableException();
}