diff options
author | Robin Lee <rgl@google.com> | 2015-07-10 19:16:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 19:16:57 +0000 |
commit | d3b6832edb5530b23132e054135c7fe93f5f9384 (patch) | |
tree | 051bd26d8be5bffc1423f225b97b1072f548d27d | |
parent | 8b9a9519c865d73ce10a5847b3b99b3cd339114e (diff) | |
parent | 7ba46433aefad363a1d2e75d4a12f2886c6d0315 (diff) | |
download | packages_apps_Settings-d3b6832edb5530b23132e054135c7fe93f5f9384.zip packages_apps_Settings-d3b6832edb5530b23132e054135c7fe93f5f9384.tar.gz packages_apps_Settings-d3b6832edb5530b23132e054135c7fe93f5f9384.tar.bz2 |
am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315':
Match getLegacyVpn calls to changed interface
-rw-r--r-- | src/com/android/settings/vpn2/ConfigDialogFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/settings/vpn2/VpnTests.java | 12 |
3 files changed, 9 insertions, 7 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) { diff --git a/tests/src/com/android/settings/vpn2/VpnTests.java b/tests/src/com/android/settings/vpn2/VpnTests.java index 26cfc9b..11e8265 100644 --- a/tests/src/com/android/settings/vpn2/VpnTests.java +++ b/tests/src/com/android/settings/vpn2/VpnTests.java @@ -129,18 +129,20 @@ public class VpnTests extends InstrumentationTestCase { } } // disconnect existing vpn if there is any - LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(); + LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(UserHandle.myUserId()); if (oldVpn != null) { Log.v(TAG, "disconnect legacy VPN"); disconnect(); // wait till the legacy VPN is disconnected. int tries = 0; - while (tries < MAX_DISCONNECTION_TRIES && mService.getLegacyVpnInfo() != null) { + while (tries < MAX_DISCONNECTION_TRIES && + mService.getLegacyVpnInfo(UserHandle.myUserId()) != null) { tries++; Thread.sleep(10 * 1000); Log.v(TAG, "Wait for legacy VPN to be disconnected."); } - Assert.assertNull("Failed to disconect VPN", mService.getLegacyVpnInfo()); + Assert.assertNull("Failed to disconect VPN", + mService.getLegacyVpnInfo(UserHandle.myUserId())); // wait for 30 seconds after the previous VPN is disconnected. sleep(30 * 1000); } @@ -276,7 +278,7 @@ public class VpnTests extends InstrumentationTestCase { * Verify the vpn connection by checking the VPN state, external IP or ping test */ private void validateVpnConnection(VpnProfile profile, boolean pingTestFlag) throws Exception { - LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(); + LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId()); Assert.assertTrue(legacyVpnInfo != null); long start = System.currentTimeMillis(); @@ -284,7 +286,7 @@ public class VpnTests extends InstrumentationTestCase { (legacyVpnInfo.state != LegacyVpnInfo.STATE_CONNECTED)) { Log.v(TAG, "vpn state: " + legacyVpnInfo.state); sleep(10 * 1000); - legacyVpnInfo = mService.getLegacyVpnInfo(); + legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId()); } // the vpn state should be CONNECTED |