Snap for 6606167 from d16053fe496c695f6b20901d89766c3763daa53a to rvc-release

Change-Id: I48562ee7fddac58c83041beeb8097dc7d04d2029
This commit is contained in:
android-build-team Robot
2020-06-19 01:03:19 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -57,6 +57,7 @@ import android.os.Build;
import android.os.IBinder;
import android.os.PersistableBundle;
import android.os.Process;
import android.platform.test.annotations.AppModeFull;
import android.util.Pair;
import androidx.test.InstrumentationRegistry;
@@ -74,6 +75,7 @@ import java.util.concurrent.Executor;
@RunWith(DevSdkIgnoreRunner.class)
@IgnoreUpTo(Build.VERSION_CODES.Q) // ConnectivityDiagnosticsManager did not exist in Q
@AppModeFull(reason = "CHANGE_NETWORK_STATE, MANAGE_TEST_NETWORKS not grantable to instant apps")
public class ConnectivityDiagnosticsManagerTest {
private static final int CALLBACK_TIMEOUT_MILLIS = 5000;
private static final int NO_CALLBACK_INVOKED_TIMEOUT = 500;

View File

@@ -30,7 +30,6 @@ import android.content.Context;
import android.content.ContentResolver;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.DnsPacket;
import android.net.DnsResolver;
import android.net.LinkProperties;
import android.net.Network;
@@ -47,6 +46,8 @@ import android.system.ErrnoException;
import android.test.AndroidTestCase;
import android.util.Log;
import com.android.net.module.util.DnsPacket;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;