Merge "Test API behavior change in standalone test case"
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index f796ecc..6c6070e 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -1072,14 +1072,6 @@
}, NETWORK_SETTINGS);
registerBestMatchingNetworkCallback(makeDefaultRequest(), bestMatchingCallback, h);
}
- if (TestUtils.shouldTestTApis()) {
- // Verify registerSystemDefaultNetworkCallback can be accessed via
- // CONNECTIVITY_USE_RESTRICTED_NETWORKS permission.
- final TestNetworkCallback systemDefaultCallback2 = new TestNetworkCallback();
- runWithShellPermissionIdentity(() ->
- registerSystemDefaultNetworkCallback(systemDefaultCallback2, h),
- CONNECTIVITY_USE_RESTRICTED_NETWORKS);
- }
Network wifiNetwork = null;
mCtsNetUtils.ensureWifiConnected();
@@ -1109,6 +1101,18 @@
}
}
+ @ConnectivityModuleTest
+ @IgnoreUpTo(Build.VERSION_CODES.R)
+ @Test
+ public void testRegisterSystemDefaultNetworkCallbackPermission() {
+ final Handler h = new Handler(Looper.getMainLooper());
+ // Verify registerSystemDefaultNetworkCallback can be accessed via
+ // CONNECTIVITY_USE_RESTRICTED_NETWORKS permission.
+ runWithShellPermissionIdentity(() ->
+ registerSystemDefaultNetworkCallback(new TestNetworkCallback(), h),
+ CONNECTIVITY_USE_RESTRICTED_NETWORKS);
+ }
+
/**
* Tests both registerNetworkCallback and unregisterNetworkCallback similarly to
* {@link #testRegisterNetworkCallback} except that a {@code PendingIntent} is used instead