summaryrefslogtreecommitdiffstats
path: root/vpn
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2009-07-30 20:36:27 +0800
committerHung-ying Tyan <tyanh@google.com>2009-07-30 20:36:27 +0800
commit1f1602e7291ab2b4d8d76db33c89828b6e58e6c0 (patch)
treee091c3145a2285e307c3c23e683771ff2a0e344b /vpn
parentfe8e48cdd5e621905b8c07325dbe77bffffdb4bb (diff)
downloadframeworks_base-1f1602e7291ab2b4d8d76db33c89828b6e58e6c0.zip
frameworks_base-1f1602e7291ab2b4d8d76db33c89828b6e58e6c0.tar.gz
frameworks_base-1f1602e7291ab2b4d8d76db33c89828b6e58e6c0.tar.bz2
Add the encryption option to PptpProfile parcel.
Diffstat (limited to 'vpn')
-rw-r--r--vpn/java/android/net/vpn/PptpProfile.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/vpn/java/android/net/vpn/PptpProfile.java b/vpn/java/android/net/vpn/PptpProfile.java
index cdc90f0..b4b7be5 100644
--- a/vpn/java/android/net/vpn/PptpProfile.java
+++ b/vpn/java/android/net/vpn/PptpProfile.java
@@ -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);
+ }
}