Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 9145 into donut

Browse Source 
* changes:
  Add the encryption option to PptpProfile parcel.
This commit is contained in:
Android (Google) Code Review
2009-07-30 05:46:07 -07:00
parent b203a57d1f 1f1602e729
commit 4598d149fb
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vpn/java/android/net/vpn/PptpProfile.java
View File

@@ -16,6 +16,8 @@
package android.net.vpn; package android.net.vpn;
import android.os.Parcel;
/** /**
* The profile for PPTP type of VPN. * The profile for PPTP type of VPN.
* {@hide} * {@hide}
@@ -39,4 +41,16 @@ public class PptpProfile extends VpnProfile {
public boolean isEncryptionEnabled() { public boolean isEncryptionEnabled() {
return mEncryption; 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);
}
} }