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

Commit c7af83f4 authored by Ken Chen's avatar Ken Chen Committed by android-build-merger
Browse files

Merge "Remove 'hasDns' parameter" 

am: 3176e8be

Change-Id: I7efc2ff04cf65420b02ddf2cf7a13b640e37ef77
parents fce422d8 3176e8be

core/java/android/os/INetworkManagementService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ interface INetworkManagementService 
    /**

     * Setup a new VPN.

     */

    void createVirtualNetwork(int netId, boolean hasDNS, boolean secure);

    void createVirtualNetwork(int netId, boolean secure);



    /**

     * Remove a network.

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

+0 −1
Original line number Diff line number Diff line
@@ -5714,7 +5714,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                // This should never fail.  Specifying an already in use NetID will cause failure.

                if (networkAgent.isVPN()) {

                    mNMS.createVirtualNetwork(networkAgent.network.netId,

                            !networkAgent.linkProperties.getDnsServers().isEmpty(),

                            (networkAgent.networkMisc == null ||

                                !networkAgent.networkMisc.allowBypass));

                } else {

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

+2 −2
Original line number Diff line number Diff line
@@ -2308,11 +2308,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    @Override

    public void createVirtualNetwork(int netId, boolean hasDNS, boolean secure) {

    public void createVirtualNetwork(int netId, boolean secure) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        try {

            mNetdService.networkCreateVpn(netId, hasDNS, secure);

            mNetdService.networkCreateVpn(netId, secure);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }