| commit | 59dfab098032fb23cafc682033a7b4afb6f52f1b | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Wed Jun 21 05:19:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 21 05:19:54 2023 +0000 |
| tree | 08aa992d4e135d6f0baea01661caae3c11dc5fa0 | |
| parent | b92e07b76042367e688cc6b0ea016dd3bccdc8d2 [diff] | |
| parent | 3a1e5d1a0f8b639119a026067dff2202503582e3 [diff] |
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>
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 03e74e0..c646ac4 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -3152,7 +3152,8 @@ } @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);