Merge change 4739 into donut (1e29daf9) · Commits · e / os / android_frameworks_native-old

vpn/java/android/net/vpn/IVpnService.aidl

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007, The Android Open Source Project
		* Copyright (C) 2009, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

+3 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007, The Android Open Source Project
		* Copyright (C) 2009, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -19,15 +19,14 @@ package android.net.vpn;
		import android.os.Parcel;

		/**
		* The profile for L2TP-over-IPSec type of VPN.
		* The profile for certificate-based L2TP-over-IPSec type of VPN.
		* {@hide}
		*/
		public class L2tpIpsecProfile extends VpnProfile {
		public class L2tpIpsecProfile extends L2tpProfile {
		private static final long serialVersionUID = 1L;

		private String mUserCertificate;
		private String mCaCertificate;
		private String mUserkey;

		@Override
		public VpnType getType() {
		@@ -50,20 +49,11 @@ public class L2tpIpsecProfile extends VpnProfile {
		return mUserCertificate;
		}

		public void setUserkey(String name) {
		mUserkey = name;
		}

		public String getUserkey() {
		return mUserkey;
		}

		@Override
		protected void readFromParcel(Parcel in) {
		super.readFromParcel(in);
		mCaCertificate = in.readString();
		mUserCertificate = in.readString();
		mUserkey = in.readString();
		}

		@Override
		@@ -71,6 +61,5 @@ public class L2tpIpsecProfile extends VpnProfile {
		super.writeToParcel(parcel, flags);
		parcel.writeString(mCaCertificate);
		parcel.writeString(mUserCertificate);
		parcel.writeString(mUserkey);
		}
		}

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net.vpn;

		import android.os.Parcel;

		/**
		* The profile for pre-shared-key-based L2TP-over-IPSec type of VPN.
		* {@hide}
		*/
		public class L2tpIpsecPskProfile extends L2tpProfile {
		private static final long serialVersionUID = 1L;

		private String mPresharedKey;

		@Override
		public VpnType getType() {
		return VpnType.L2TP_IPSEC_PSK;
		}

		public void setPresharedKey(String key) {
		mPresharedKey = key;
		}

		public String getPresharedKey() {
		return mPresharedKey;
		}

		@Override
		protected void readFromParcel(Parcel in) {
		super.readFromParcel(in);
		mPresharedKey = in.readString();
		}

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		super.writeToParcel(parcel, flags);
		parcel.writeString(mPresharedKey);
		}
		}

+39 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007, The Android Open Source Project
		* Copyright (C) 2009, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -16,6 +16,8 @@

		package android.net.vpn;

		import android.os.Parcel;

		/**
		* The profile for L2TP type of VPN.
		* {@hide}
		@@ -23,8 +25,44 @@ package android.net.vpn;
		public class L2tpProfile extends VpnProfile {
		private static final long serialVersionUID = 1L;

		private boolean mSecret;
		private String mSecretString;

		@Override
		public VpnType getType() {
		return VpnType.L2TP;
		}

		/**
		* Enables/disables the secret for authenticating tunnel connection.
		*/
		public void setSecretEnabled(boolean enabled) {
		mSecret = enabled;
		}

		public boolean isSecretEnabled() {
		return mSecret;
		}

		public void setSecretString(String secret) {
		mSecretString = secret;
		}

		public String getSecretString() {
		return mSecretString;
		}

		@Override
		protected void readFromParcel(Parcel in) {
		super.readFromParcel(in);
		mSecret = in.readInt() > 0;
		mSecretString = in.readString();
		}

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		super.writeToParcel(parcel, flags);
		parcel.writeInt(mSecret ? 1 : 0);
		parcel.writeString(mSecretString);
		}
		}

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net.vpn;

		/**
		* The profile for PPTP type of VPN.
		* {@hide}
		*/
		public class PptpProfile extends VpnProfile {
		private static final long serialVersionUID = 1L;

		@Override
		public VpnType getType() {
		return VpnType.PPTP;
		}
		}