commit 9f71aa3e4dc61d4d94458382445b251dcfa97c91
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 12 17:20:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 12 17:20:11 2024 +0000
tree b4edecfde2053a504f5e33ed92614a236827ba4d
parent 2842b3282dd50ec1ef535e74b5a9ef0f8ff78dd4
parent d393a9d8d421ada4a11d3c013409c41858ff37e3

Merge "Remove assert for R+" into main

staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt

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)