From 5c2e383949a517b48d3b9c5638f9396709c6681c Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Mon, 8 Jun 2020 13:38:11 -0700 Subject: [PATCH] Only run ConnectivityDiagnosticsManagerTest as AppModeFull. This CL restricts ConnectivityDiagnosticsManagerTest to only being run as @AppModeFull. This is required, as Instant Apps are not allowed CHANGE_NETWORK_STATE (required for CM#requestNetwork) or MANAGE_TEST_NETWORKS (required for TestNetworkManager#setupTestNetwork) permissions - both of which are required for ConnectivityDiagnosticsManagerTest. Bug: 158431112 Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest Change-Id: Id867b8dcaca758cfeb83009848e1099e900a0790 Merged-In: Id867b8dcaca758cfeb83009848e1099e900a0790 --- .../src/android/net/cts/ConnectivityDiagnosticsManagerTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java index 5fe05bce64..1e64d83a17 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java @@ -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;