| commit | 070df6f6cfd0a20382b18ce4601381a8754ab91c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 12 17:33:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 12 17:33:14 2024 +0000 |
| tree | 996a59856b7e047bf26f6345d050c1f1c0f56dfa | |
| parent | 45cd8877a6b5898e75446897e56ccea1a138b2f1 [diff] | |
| parent | 02ff89877fa6795aa8c70726dc9fcbbde1f857f0 [diff] |
Merge "Remove assert for R+" into main am: 9f71aa3e4d am: 02ff89877f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3264661 Change-Id: I7230233c3ab3da3684844c6713969d21bafe831b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt index 84fb47b..341d55f 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
@@ -29,7 +29,6 @@ import android.os.Binder import android.os.Build import androidx.annotation.RequiresApi -import com.android.modules.utils.build.SdkLevel.isAtLeastR import com.android.modules.utils.build.SdkLevel.isAtLeastS import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit @@ -137,7 +136,6 @@ network = try { if (lp != null) { - assertTrue(isAtLeastR(), "Cannot specify TestNetwork LinkProperties before R") tnm.setupTestNetwork(lp, true /* isMetered */, binder) } else { tnm.setupTestNetwork(iface.interfaceName, binder)