Merge "Skip testDefaultNetworkActiveListener on R devices." am: 3d153f9a89 am: 3a1e5d1a0f

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

Change-Id: I44ba7c55adbc79f0f01722d6790cff4aa93650e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2023-06-21 05:19:54 +00:00
committed by Automerger Merge Worker

View File

@@ -3152,7 +3152,8 @@ public class ConnectivityManagerTest {
}
@AppModeFull(reason = "Need WiFi support to test the default active network")
@Test
// NetworkActivityTracker is not mainlined before S.
@Test @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
public void testDefaultNetworkActiveListener() throws Exception {
final boolean supportWifi = mPackageManager.hasSystemFeature(FEATURE_WIFI);
final boolean supportTelephony = mPackageManager.hasSystemFeature(FEATURE_TELEPHONY);