| commit | 3c476f3c79377679e7b2dd52068f7b498355cba6 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Wed Jun 21 06:07:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 21 06:07:36 2023 +0000 |
| tree | 9b683c245786a84d65fe7c72c2c2f5c253fa409e | |
| parent | 65e78050c681a5417e10048043ad3f70113acd25 [diff] | |
| parent | 59dfab098032fb23cafc682033a7b4afb6f52f1b [diff] |
Merge "Skip testDefaultNetworkActiveListener on R devices." am: 3d153f9a89 am: 3a1e5d1a0f am: 59dfab0980 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624371 Change-Id: I25374347528c2be0be858c352b75382c08f9c618 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);