diff options
author | 2017-08-16 19:05:49 +0000 | |
---|---|---|
committer | 2017-08-16 19:05:49 +0000 | |
commit | 1af40a942b9fb049248365363a9848528a1dc1ad (patch) | |
tree | 5b0a37e29d189cc7054593acac9392a9974a5f70 | |
parent | e3d4a14380a1b88fef5c4d2a2431d7864d15b3ee (diff) | |
parent | 3da6a1fc82b7e0c7adc88b92e50cceec8173672e (diff) |
Merge "Unbreak VPN unit tests."
-rw-r--r-- | tests/net/java/com/android/server/connectivity/VpnTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/connectivity/VpnTest.java b/tests/net/java/com/android/server/connectivity/VpnTest.java index f0b3724955aa..d0370665e646 100644 --- a/tests/net/java/com/android/server/connectivity/VpnTest.java +++ b/tests/net/java/com/android/server/connectivity/VpnTest.java @@ -32,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; +import android.content.res.Resources; import android.net.NetworkInfo.DetailedState; import android.net.UidRange; import android.net.VpnService; @@ -46,6 +47,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.util.ArrayMap; import android.util.ArraySet; +import com.android.internal.R; import com.android.internal.net.VpnConfig; import org.mockito.Answers; @@ -116,6 +118,9 @@ public class VpnTest extends AndroidTestCase { when(mContext.getSystemService(eq(Context.APP_OPS_SERVICE))).thenReturn(mAppOps); when(mContext.getSystemService(eq(Context.NOTIFICATION_SERVICE))) .thenReturn(mNotificationManager); + when(mContext.getString(R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)) + .thenReturn(Resources.getSystem().getString( + R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)); // Used by {@link Notification.Builder} ApplicationInfo applicationInfo = new ApplicationInfo(); |