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

Merge "Match getLegacyVpn calls to changed interface" into mnc-dev

Browse Source
This commit is contained in:
Robin Lee
2015-07-10 19:05:36 +00:00
committed by Android (Google) Code Review
parent 331b9823d0 290784afde
commit 7ba46433ae
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -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());

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

@@ -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) {