diff options
| author | Robin Lee <rgl@google.com> | 2015-07-10 19:05:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 19:05:41 +0000 |
| commit | 7ba46433aefad363a1d2e75d4a12f2886c6d0315 (patch) | |
| tree | 6cb8c81e906cd617c3c2acde65a0ef4b2916039f /src/com/android | |
| parent | 331b9823d0a686d414f181ed406181d1d4e2aa1a (diff) | |
| parent | 290784afded5426d5b1d0cb7d71586237445c802 (diff) | |
| download | packages_apps_Settings-7ba46433aefad363a1d2e75d4a12f2886c6d0315.zip packages_apps_Settings-7ba46433aefad363a1d2e75d4a12f2886c6d0315.tar.gz packages_apps_Settings-7ba46433aefad363a1d2e75d4a12f2886c6d0315.tar.bz2 | |
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/vpn2/ConfigDialogFragment.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 26b7982..80f9fcd 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -144,7 +144,7 @@ public class ConfigDialogFragment extends DialogFragment implements private void disconnect(VpnProfile profile) { try { - LegacyVpnInfo connected = mService.getLegacyVpnInfo(); + LegacyVpnInfo connected = mService.getLegacyVpnInfo(UserHandle.myUserId()); if (connected != null && profile.key.equals(connected.key)) { mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, UserHandle.myUserId()); diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 4192d2e..b0a08c8 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -236,7 +236,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements try { // Legacy VPNs mConnectedLegacyVpn = null; - LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(); + LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(UserHandle.myUserId()); if (info != null) { ConfigPreference preference = mConfigPreferences.get(info.key); if (preference != null) { |