Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" am: a8a7cfd668

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1743373

Change-Id: Id99ab133d4b682cfc77777b63be564c2f5450308
This commit is contained in:
Frank Li
2021-06-23 02:08:39 +00:00
committed by Automerger Merge Worker

View File

@@ -702,6 +702,7 @@ public class ConnectivityManagerTest {
.build(); .build();
} }
@AppModeFull(reason = "WRITE_SECURE_SETTINGS permission can't be granted to instant apps")
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testIsPrivateDnsBroken() throws InterruptedException { public void testIsPrivateDnsBroken() throws InterruptedException {
final String invalidPrivateDnsServer = "invalidhostname.example.com"; final String invalidPrivateDnsServer = "invalidhostname.example.com";
@@ -2316,7 +2317,7 @@ public class ConnectivityManagerTest {
* For specified apps, validate networks are prioritized in order: unmetered, TEST transport, * For specified apps, validate networks are prioritized in order: unmetered, TEST transport,
* default network. * default network.
*/ */
@AppModeFull(reason = "Cannot get WifiManager in instant app mode") @AppModeFull(reason = "Instant apps cannot create test networks")
@Test @Test
public void testSetOemNetworkPreferenceForTestPref() throws Exception { public void testSetOemNetworkPreferenceForTestPref() throws Exception {
// Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31 // Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31
@@ -2376,6 +2377,7 @@ public class ConnectivityManagerTest {
* Verify that per-app OEM network preference functions as expected for network pref TEST_ONLY. * Verify that per-app OEM network preference functions as expected for network pref TEST_ONLY.
* For specified apps, validate that only TEST transport type networks are used. * For specified apps, validate that only TEST transport type networks are used.
*/ */
@AppModeFull(reason = "Instant apps cannot create test networks")
@Test @Test
public void testSetOemNetworkPreferenceForTestOnlyPref() throws Exception { public void testSetOemNetworkPreferenceForTestOnlyPref() throws Exception {
// Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31 // Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31