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

am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

Browse Source 
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
  Include the interface for clearDnsInterfaceForUidRange
This commit is contained in:
Chad Brubaker
2014-03-24 19:35:20 +00:00
committed by Android Git Automerger
parent b7fe33633b 7f623d6b94
commit ff3bb2fe95
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

@@ -419,7 +419,7 @@ interface INetworkManagementService
/** /**
* Clear a user range from being associated with an interface. * 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. * 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

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

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

@@ -1686,10 +1686,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
@Override @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); mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
try { try {
mConnector.execute("resolver", "clearifaceforuidrange", uid_start, uid_end); mConnector.execute("resolver", "clearifaceforuidrange", iface, uid_start, uid_end);
} catch (NativeDaemonConnectorException e) { } catch (NativeDaemonConnectorException e) {
throw e.rethrowAsParcelableException(); throw e.rethrowAsParcelableException();
} }