commit fdf34500e2c029e2e20bf2fe53688de023c52294
author Chiachang Wang <chiachangwang@google.com> Tue Apr 13 06:59:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 13 06:59:05 2021 +0000
tree 14bcab8acffc2b8ebdee7d7cb42e52606d197caf
parent 314d51526b3fa261276847f0d3a14c97b5aed58e
parent 38b1591c16ac16f693bbbe6636535a06068ddc33

Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3 am: 38b1591c16

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I0cdc2e50246204925590ba556b6b67a7499140ee

tests/net/common/java/android/net/NetworkAgentConfigTest.kt

diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
index db939f9..454d5b5 100644
--- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
@@ -63,8 +63,10 @@
             setPartialConnectivityAcceptable(false)
             setUnvalidatedConnectivityAcceptable(true)
             setLegacyTypeName("TEST_NETWORK")
-            setNat64DetectionEnabled(false)
-            setProvisioningNotificationEnabled(false)
+            if (isAtLeastS()) {
+                setNat64DetectionEnabled(false)
+                setProvisioningNotificationEnabled(false)
+            }
         }.build()
 
         assertTrue(config.isExplicitlySelected())
@@ -73,7 +75,12 @@
         assertFalse(config.isPartialConnectivityAcceptable())
         assertTrue(config.isUnvalidatedConnectivityAcceptable())
         assertEquals("TEST_NETWORK", config.getLegacyTypeName())
-        assertFalse(config.isNat64DetectionEnabled())
-        assertFalse(config.isProvisioningNotificationEnabled())
+        if (isAtLeastS()) {
+            assertFalse(config.isNat64DetectionEnabled())
+            assertFalse(config.isProvisioningNotificationEnabled())
+        } else {
+            assertTrue(config.isNat64DetectionEnabled())
+            assertTrue(config.isProvisioningNotificationEnabled())
+        }
     }
 }