Snap for 11812660 from 328e1532404b042095ed31272f37aec5b9b02a45 to sdk-releasesdk-release

Change-Id: I49770df31dd6354f6fa5a7bf89cf57269c0b467c

1 files changed, 0 insertions, 21 deletions

diff --git a/Common/src/com/googlecode/android_scripting/facade/VpnFacade.java b/Common/src/com/googlecode/android_scripting/facade/VpnFacade.java
index bed8cc82..e4161e21 100644
--- a/Common/src/com/googlecode/android_scripting/facade/VpnFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/VpnFacade.java
@@ -19,25 +19,17 @@ package com.googlecode.android_scripting.facade;
 import android.app.Service;
 import android.net.VpnManager;
 import android.os.RemoteException;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.security.LegacyVpnProfileStore;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
-import com.android.internal.util.ArrayUtils;
 
-import com.google.android.collect.Lists;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
 import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcParameter;
 
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Access VPN functions.
  */
@@ -54,19 +46,6 @@ public class VpnFacade extends RpcReceiver {
         mVpnManager = mService.getSystemService(VpnManager.class);
     }
 
-    static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
-        final ArrayList<VpnProfile> result = Lists.newArrayList();
-
-        for (String key : LegacyVpnProfileStore.list(Credentials.VPN)) {
-            final VpnProfile profile = VpnProfile.decode(key,
-                    LegacyVpnProfileStore.get(Credentials.VPN + key));
-            if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
-                result.add(profile);
-            }
-        }
-        return result;
-    }
-
     private VpnProfile genLegacyVpnProfile(JSONObject vpnProfileJson) {
         VpnProfile vp = new VpnProfile(vpnProfileJson.optString("key", ""));
         vp.name = vpnProfileJson.optString("name", "");