diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 16b3d5ad81..852043d93d 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -573,6 +573,12 @@ public class ConnectivityServiceTest { // is ",,". PID+UID permissons have priority over generic ones. private final HashMap mMockedPermissions = new HashMap<>(); + private void mockStringResource(int resId) { + doAnswer((inv) -> { + return "Mock string resource ID=" + inv.getArgument(0); + }).when(mInternalResources).getString(resId); + } + MockContext(Context base, ContentProvider settingsProvider) { super(base); @@ -585,6 +591,16 @@ public class ConnectivityServiceTest { }).when(mInternalResources) .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, + }; + for (int resId : stringResourcesToMock) { + mockStringResource(resId); + } + mContentResolver = new MockContentResolver(); mContentResolver.addProvider(Settings.AUTHORITY, settingsProvider); }