commit 93a72d22a5bd60fbfbb67f6bfe13b2edf25ffd77
author Lorenzo Colitti <lorenzo@google.com> Tue Feb 22 10:17:09 2022 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Feb 22 10:17:09 2022 +0900
tree 74071c3b4f96d93f030d98bc7146a78820a002f8
parent 19e61719261bd837504488d185f7b298593da490

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

tests/unit/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 852043d..d5f1516 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -592,10 +592,12 @@
                     .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);