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

Commit 7aeee0da authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 6d78dd8e: Merge change 4147 into donut 

Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'

* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
  On the way of refactoring out SingleServerProfile.java.
parents 3b8e9c4e f6cab720

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

+0 −21
Original line number Diff line number Diff line
@@ -23,25 +23,4 @@ import android.os.Parcel; 
 * {@hide}

 */

public abstract class SingleServerProfile extends VpnProfile {

    private String mServerName;



    public void setServerName(String name) {

        mServerName = name;

    }



    public String getServerName() {

        return mServerName;

    }



    @Override

    protected void readFromParcel(Parcel in) {

        super.readFromParcel(in);

        mServerName = in.readString();

    }



    @Override

    public void writeToParcel(Parcel parcel, int flags) {

        super.writeToParcel(parcel, flags);

        parcel.writeString(mServerName);

    }

}

vpn/java/android/net/vpn/VpnProfile.java

+25 −0
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { 
    private static final long serialVersionUID = 1L;

    private String mName; // unique display name

    private String mId; // unique identifier

    private String mServerName; // VPN server name

    private String mDomainSuffices; // space separated list

    private String mRouteList; // space separated list

    private String mSavedUsername;

    private boolean mIsCustomized;

    private transient VpnState mState = VpnState.IDLE;
@@ -57,6 +59,17 @@ public abstract class VpnProfile implements Parcelable, Serializable { 
        return mId;

    }



    /**

     * Sets the name of the VPN server. Used for DNS lookup.

     */

    public void setServerName(String name) {

        mServerName = name;

    }



    public String getServerName() {

        return mServerName;

    }



    /**

     * Sets the domain suffices for DNS resolution.

     *
@@ -84,6 +97,14 @@ public abstract class VpnProfile implements Parcelable, Serializable { 
        return mRouteList;

    }



    public void setSavedUsername(String name) {

        mSavedUsername = name;

    }



    public String getSavedUsername() {

        return mSavedUsername;

    }



    public void setState(VpnState state) {

        mState = state;

    }
@@ -116,8 +137,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { 
    protected void readFromParcel(Parcel in) {

        mName = in.readString();

        mId = in.readString();

        mServerName = in.readString();

        mDomainSuffices = in.readString();

        mRouteList = in.readString();

        mSavedUsername = in.readString();

    }



    public static final Parcelable.Creator<VpnProfile> CREATOR =
@@ -142,8 +165,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { 
        parcel.writeInt(mIsCustomized ? 1 : 0);

        parcel.writeString(mName);

        parcel.writeString(mId);

        parcel.writeString(mServerName);

        parcel.writeString(mDomainSuffices);

        parcel.writeString(mRouteList);

        parcel.writeString(mSavedUsername);

    }



    public int describeContents() {