Merge change 9145 into donut (3d067c43) · Commits · e / os / android_frameworks_native

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);
		}
		}