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

Unconfigure the lockdown VPN if the user forgets its profile.

Browse Source 
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.

Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.

Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
This commit is contained in:
Lorenzo Colitti
2015-10-13 15:23:38 +09:00
parent 90de3bebf4
commit c311c94af5
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
package com.android.settings.vpn2;
import java.util.Arrays;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.Context;
@@ -123,7 +125,18 @@ public class ConfigDialogFragment extends DialogFragment implements
disconnect(profile);
// Delete from KeyStore
KeyStore.getInstance().delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
KeyStore keyStore = KeyStore.getInstance();
keyStore.delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
// If this was the current lockdown VPN, clear it.
if (Arrays.equals(profile.key.getBytes(), keyStore.get(Credentials.LOCKDOWN_VPN))) {
keyStore.delete(Credentials.LOCKDOWN_VPN);
try {
mService.updateLockdownVpn();
} catch (RemoteException e) {
Log.e(TAG, "Failed to clear lockdown VPN configuration");
}
}
}
dismiss();
}