From 93a72d22a5bd60fbfbb67f6bfe13b2edf25ffd77 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 22 Feb 2022 10:17:09 +0900 Subject: [PATCH] Mock more resources for VPNs. 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 --- .../com/android/server/ConnectivityServiceTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 852043d93d..d5f15160c5 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -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);