Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95e0eed authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by The Android Open Source Project
Browse files

am 0304325d: Remove SingleServerProfile. 

Merge commit '0304325dd72ff8713c8444e909d387af1447f86f'

* commit '0304325dd72ff8713c8444e909d387af1447f86f':
  Remove SingleServerProfile.
parents 10a3828f e125f0ca

vpn/java/android/net/vpn/L2tpIpsecProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Parcel; 
 * The profile for L2TP-over-IPSec type of VPN.

 * {@hide}

 */

public class L2tpIpsecProfile extends SingleServerProfile {

public class L2tpIpsecProfile extends VpnProfile {

    private static final long serialVersionUID = 1L;



    private String mUserCertificate;

vpn/java/android/net/vpn/L2tpProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package android.net.vpn; 
 * The profile for L2TP type of VPN.

 * {@hide}

 */

public class L2tpProfile extends SingleServerProfile {

public class L2tpProfile extends VpnProfile {

    private static final long serialVersionUID = 1L;



    @Override

vpn/java/android/net/vpn/SingleServerProfile.java

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007, 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 single-server type of VPN.

 * {@hide}

 */

public abstract class SingleServerProfile extends VpnProfile {

}