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

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

Browse Source 
* commit '1bbabd3c3642bd81cd838a9801212704fdb41d50':
  Clear connected legacy VPN during rescan
This commit is contained in:
Robin Lee
2015-06-02 20:32:00 +00:00
committed by Android Git Automerger
parent 591a293a23 1bbabd3c36
commit e1f7b6810d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,6 +234,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
// Mark out connections with a subtitle // Mark out connections with a subtitle
try { try {
// Legacy VPNs // Legacy VPNs
mConnectedLegacyVpn = null;
LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(); LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo();
if (info != null) { if (info != null) {
ConfigPreference preference = mConfigPreferences.get(info.key); ConfigPreference preference = mConfigPreferences.get(info.key);