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

Commit 0c6bb273 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "VPN: export legacy VPN in IConnectivityManager."

parents 31c10a95 77fd485c

core/java/android/net/IConnectivityManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -104,4 +104,6 @@ interface IConnectivityManager 
    String prepareVpn(String packageName);



    ParcelFileDescriptor establishVpn(in VpnConfig config);



    void doLegacyVpn(in VpnConfig config, in String[] racoon, in String[] mtpd);

}

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

+9 −0
Original line number Diff line number Diff line
@@ -2505,6 +2505,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        return mVpn.establish(config);

    }



    /**

     * Handle a legacy VPN request.

     * @hide

     */

    @Override

    public void doLegacyVpn(VpnConfig config, String[] racoon, String[] mtpd) {

        mVpn.doLegacyVpn(config, racoon, mtpd);

    }



    private String getDefaultInterface() {

        if (ConnectivityManager.isNetworkTypeValid(mActiveDefaultNetwork)) {

            NetworkStateTracker tracker = mNetTrackers[mActiveDefaultNetwork];