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

Commit c7726147 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 1fce89d9: am de4e7b49: Merge "Include the interface for... 

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

* commit '1fce89d9':
  Include the interface for clearDnsInterfaceForUidRange
parents 1d77a874 1fce89d9

core/java/android/os/INetworkManagementService.aidl

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

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

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

            }

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

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

        }