aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2024-04-25 19:32:11 +0000
committerEric Biggers <ebiggers@google.com>2024-04-25 19:53:18 +0000
commit328e1532404b042095ed31272f37aec5b9b02a45 (patch)
treeeade2014d21eec8b8999c004032b933c0d0b002f
parent312d692dc95988e32e4f06d7c84359b376bd5042 (diff)
downloadsl4a-main.tar.gz
Remove unused method VpnFacade#loadVpnProfiles()HEADmastermain
The class android.security.KeyStore is going away. The package-private method VpnFacade#loadVpnProfiles() takes an instance of android.security.KeyStore as a parameter and doesn't do anything with it. However this method is never actually called, so just remove it. Bug: 326508120 Test: build Flag: TEST_ONLY Change-Id: I7eb402334cd764bfee906645af58776f5b12e338
-rw-r--r--Common/src/com/googlecode/android_scripting/facade/VpnFacade.java21
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", "");