am 1bbabd3c: am 32096856: am 81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev

* commit '1bbabd3c3642bd81cd838a9801212704fdb41d50': Clear connected legacy VPN during rescan
2015-06-02 20:32:00 +00:00
parent 591a293a23 1bbabd3c36
commit e1f7b6810d
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -234,6 +234,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
        // Mark out connections with a subtitle
        try {
            // Legacy VPNs
+            mConnectedLegacyVpn = null;
            LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo();
            if (info != null) {
                ConfigPreference preference = mConfigPreferences.get(info.key);