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

Commit 61b773f3 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 9114 into donut 

* changes:
  Add state saving mechanism to support proc restart
parents ccf407f7 0bd458b9

vpn/java/android/net/vpn/PptpProfile.java

+12 −0
Original line number Diff line number Diff line
@@ -22,9 +22,21 @@ package android.net.vpn; 
 */

public class PptpProfile extends VpnProfile {

    private static final long serialVersionUID = 1L;

    private boolean mEncryption = true;



    @Override

    public VpnType getType() {

        return VpnType.PPTP;

    }



    /**

     * Enables/disables the encryption for PPTP tunnel.

     */

    public void setEncryptionEnabled(boolean enabled) {

        mEncryption = enabled;

    }



    public boolean isEncryptionEnabled() {

        return mEncryption;

    }

}

vpn/java/android/net/vpn/VpnManager.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ public class VpnManager { 
    public static final int VPN_ERROR_CONNECTION_FAILED = 2;

    /** Error code to indicate the server is not known. */

    public static final int VPN_ERROR_UNKNOWN_SERVER = 3;

    /** Error code to indicate an error from challenge response. */

    public static final int VPN_ERROR_CHALLENGE = 4;

    /** Error code to indicate an error of remote server hanging up. */

    public static final int VPN_ERROR_REMOTE_HUNG_UP = 5;

    private static final int VPN_ERROR_NO_ERROR = 0;



    public static final String PROFILES_PATH = "/data/misc/vpn/profiles";