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

Commit b5ba1545 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 4598d149: Merge change 9145 into donut 

Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9'

* commit '4598d149fb9c081877a214d74efadcb60d2acbb9':
  Add the encryption option to PptpProfile parcel.
parents 7deedbd5 3d067c43

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

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.net.vpn;



import android.os.Parcel;



/**

 * The profile for PPTP type of VPN.

 * {@hide}
@@ -39,4 +41,16 @@ public class PptpProfile extends VpnProfile { 
    public boolean isEncryptionEnabled() {

        return mEncryption;

    }



    @Override

    protected void readFromParcel(Parcel in) {

        super.readFromParcel(in);

        mEncryption = in.readInt() > 0;

    }



    @Override

    public void writeToParcel(Parcel parcel, int flags) {

        super.writeToParcel(parcel, flags);

        parcel.writeInt(mEncryption ? 1 : 0);

    }

}