On the way of refactoring out SingleServerProfile.java.

+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.

1 files changed, 2 insertions, 2 deletions

diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnService.java b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
index 01106b3..fdefe9c 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
@@ -20,8 +20,8 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.net.vpn.SingleServerProfile;
 import android.net.vpn.VpnManager;
+import android.net.vpn.VpnProfile;
 import android.net.vpn.VpnState;
 import android.os.FileObserver;
 import android.os.SystemProperties;
@@ -38,7 +38,7 @@ import java.util.List;
 /**
  * The service base class for managing a type of VPN connection.
  */
-abstract class VpnService<E extends SingleServerProfile> {
+abstract class VpnService<E extends VpnProfile> {
     private static final int NOTIFICATION_ID = 1;
     private static final String PROFILES_ROOT = VpnManager.PROFILES_PATH + "/";
     public static final String DEFAULT_CONFIG_PATH = "/etc";