Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af40a94 authored by Charles He's avatar Charles He Committed by Android (Google) Code Review
Browse files

Merge "Unbreak VPN unit tests."

parents e3d4a143 3da6a1fc

tests/net/java/com/android/server/connectivity/VpnTest.java

+5 −0
Original line number Diff line number Diff line
@@ -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();