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

Restore legacy VPN stats dialog.

Browse Source 
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
This commit is contained in:
Jeff Davidson
2014-08-22 13:12:01 -07:00
parent 2534be3746
commit b2bb1973fe
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,6 +350,15 @@ public class VpnSettings extends SettingsPreferenceFragment implements
if (preference instanceof VpnPreference) { if (preference instanceof VpnPreference) {
VpnProfile profile = ((VpnPreference) preference).getProfile(); VpnProfile profile = ((VpnPreference) preference).getProfile();
if (mInfo != null && profile.key.equals(mInfo.key) &&
mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {
try {
mInfo.intent.send();
return true;
} catch (Exception e) {
// ignore
}
}
mDialog = new VpnDialog(getActivity(), this, profile, false); mDialog = new VpnDialog(getActivity(), this, profile, false);
} else { } else {
// Generate a new key. Here we just use the current time. // Generate a new key. Here we just use the current time.