joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Mock more resources for VPNs.

Browse source 
These also cause ConnectivityCoverageTests to fail when built
from master and run on S. They are used in Vpn.java, not
LockdownVpnTracker.

They were not addressed in the previous CL because running this
test locally is difficult.

Test: forrest
Change-Id: I7d687338fd6bc7468b1abcae58898322554e647b
This commit is contained in:
Lorenzo Colitti 2022-02-22 10:17:09 +09:00
commit 93a72d22a5
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -592,10 +592,12 @@ public class ConnectivityServiceTest {
.getStringArray(com.android.internal.R.array.networkAttributes);
final int[] stringResourcesToMock = new int[] {
com.android.internal.R.string.vpn_lockdown_config,
com.android.internal.R.string.vpn_lockdown_connected,
com.android.internal.R.string.vpn_lockdown_connecting,
com.android.internal.R.string.vpn_lockdown_error,
com.android.internal.R.string.config_customVpnAlwaysOnDisconnectedDialogComponent,
com.android.internal.R.string.vpn_lockdown_config,
com.android.internal.R.string.vpn_lockdown_connected,
com.android.internal.R.string.vpn_lockdown_connecting,
com.android.internal.R.string.vpn_lockdown_disconnected,
com.android.internal.R.string.vpn_lockdown_error,
};
for (int resId : stringResourcesToMock) {
mockStringResource(resId);