PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[VPN] save public legacy VPN details publicly"

Browse Source
This commit is contained in:
Robin Lee
2016-01-06 12:16:56 +00:00
committed by Android (Google) Code Review
parent 0d228a62bd 4c85639733
commit c90e67deae
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -107,7 +107,7 @@ public class ConfigDialogFragment extends DialogFragment implements
if (button == DialogInterface.BUTTON_POSITIVE) {
// Update KeyStore entry
KeyStore.getInstance().put(Credentials.VPN + profile.key, profile.encode(),
KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
KeyStore.UID_SELF, /* flags */ 0);
// Flush out old version of profile
disconnect(profile);

5
src/com/android/settings/vpn2/LockdownConfigFragment.java
View File

@@ -64,9 +64,6 @@ public class LockdownConfigFragment extends DialogFragment {
}
private static String getStringOrNull(KeyStore keyStore, String key) {
if (!keyStore.isUnlocked()) {
return null;
}
final byte[] value = keyStore.get(key);
return value == null ? null : new String(value);
}
@@ -122,7 +119,7 @@ public class LockdownConfigFragment extends DialogFragment {
return;
}
keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
KeyStore.UID_SELF, /* flags */ 0);
}
// kick profiles since we changed them

7
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -456,13 +456,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
protected static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
final ArrayList<VpnProfile> result = Lists.newArrayList();
// This might happen if the user does not yet have a keystore. Quietly short-circuit because
// no keystore means no VPN configs.
if (!keyStore.isUnlocked()) {
return result;
}
// We are the only user of profiles in KeyStore so no locks are needed.
for (String key : keyStore.list(Credentials.VPN)) {
final VpnProfile profile = VpnProfile.decode(key, keyStore.get(Credentials.VPN + key));
if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {