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

Match getLegacyVpn calls to changed interface

Browse Source 
The userId argument is now explicit. Pre-requisite for bug 21499103

Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
This commit is contained in:
Robin Lee
2015-07-07 12:33:45 -07:00
parent 66b5a58a68
commit 290784afde
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) { private void disconnect(VpnProfile profile) {
try { try {
LegacyVpnInfo connected = mService.getLegacyVpnInfo(); LegacyVpnInfo connected = mService.getLegacyVpnInfo(UserHandle.myUserId());
if (connected != null && profile.key.equals(connected.key)) { if (connected != null && profile.key.equals(connected.key)) {
mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN,
UserHandle.myUserId()); UserHandle.myUserId());

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

@@ -236,7 +236,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
try { try {
// Legacy VPNs // Legacy VPNs
mConnectedLegacyVpn = null; mConnectedLegacyVpn = null;
LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(); LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(UserHandle.myUserId());
if (info != null) { if (info != null) {
ConfigPreference preference = mConfigPreferences.get(info.key); ConfigPreference preference = mConfigPreferences.get(info.key);
if (preference != null) { if (preference != null) {

12
tests/src/com/android/settings/vpn2/VpnTests.java
View File

@@ -129,18 +129,20 @@ public class VpnTests extends InstrumentationTestCase {
} }
} }
// disconnect existing vpn if there is any // disconnect existing vpn if there is any
LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(); LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(UserHandle.myUserId());
if (oldVpn != null) { if (oldVpn != null) {
Log.v(TAG, "disconnect legacy VPN"); Log.v(TAG, "disconnect legacy VPN");
disconnect(); disconnect();
// wait till the legacy VPN is disconnected. // wait till the legacy VPN is disconnected.
int tries = 0; int tries = 0;
while (tries < MAX_DISCONNECTION_TRIES && mService.getLegacyVpnInfo() != null) { while (tries < MAX_DISCONNECTION_TRIES &&
mService.getLegacyVpnInfo(UserHandle.myUserId()) != null) {
tries++; tries++;
Thread.sleep(10 * 1000); Thread.sleep(10 * 1000);
Log.v(TAG, "Wait for legacy VPN to be disconnected."); 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. // wait for 30 seconds after the previous VPN is disconnected.
sleep(30 * 1000); 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 * Verify the vpn connection by checking the VPN state, external IP or ping test
*/ */
private void validateVpnConnection(VpnProfile profile, boolean pingTestFlag) throws Exception { private void validateVpnConnection(VpnProfile profile, boolean pingTestFlag) throws Exception {
LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(); LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
Assert.assertTrue(legacyVpnInfo != null); Assert.assertTrue(legacyVpnInfo != null);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
@@ -284,7 +286,7 @@ public class VpnTests extends InstrumentationTestCase {
(legacyVpnInfo.state != LegacyVpnInfo.STATE_CONNECTED)) { (legacyVpnInfo.state != LegacyVpnInfo.STATE_CONNECTED)) {
Log.v(TAG, "vpn state: " + legacyVpnInfo.state); Log.v(TAG, "vpn state: " + legacyVpnInfo.state);
sleep(10 * 1000); sleep(10 * 1000);
legacyVpnInfo = mService.getLegacyVpnInfo(); legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
} }
// the vpn state should be CONNECTED // the vpn state should be CONNECTED