From d2bce7b6e3d67cd4349584cae2cf03eb3966b0c6 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Tue, 13 Apr 2021 10:18:36 +0800 Subject: [PATCH] Add SDK version check to skip S added API test NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk. It will be used in mainline test with a R build. Test will fail with method not found error. Add a version check to skip the S added API tests. Test: atest NetworkAgentConfigTest in R and S device Fix: 185151127 Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf --- .../java/android/net/NetworkAgentConfigTest.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt index db939f907c..454d5b5266 100644 --- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt +++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt @@ -63,8 +63,10 @@ class NetworkAgentConfigTest { 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 @@ class NetworkAgentConfigTest { 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()) + } } }