Merge "Only run ConnectivityDiagnosticsManagerTest as AppModeFull." am: 1b7351a948

Original change: https://android-review.googlesource.com/c/platform/cts/+/1326394

Change-Id: I66f85a4ef7f6f2146af5084ab7366532d69cad5a
This commit is contained in:
Cody Kesting
2020-06-24 16:06:38 +00:00
committed by Automerger Merge Worker

View File

@@ -65,6 +65,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.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -90,6 +91,7 @@ import java.util.concurrent.TimeUnit;
@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;