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

Merge "Restore legacy VPN stats dialog." into lmp-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-08-23 00:55:38 +00:00
committed by Android (Google) Code Review
parent 1351b0fbcd b2bb1973fe
commit 8e6edba560
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.