commit 04bdf2ce145e757dc493d9bc320f6ec581eb0583
author Android (Google) Code Review <android-gerrit@google.com> Thu Jul 30 16:05:51 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 30 16:05:51 2009 -0700
tree 05f1b4a90a9dfa4e25c6221ff0d0f6771ad2e8b4
parent 455266e1737ab0c4935543bd086c926da8ff5771
parent 4598d149fb9c081877a214d74efadcb60d2acbb9

am 4598d149: Merge change 9145 into donut

Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9'

* commit '4598d149fb9c081877a214d74efadcb60d2acbb9':
  Add the encryption option to PptpProfile parcel.

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

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