From a3f6cae74b1d1810b2d277aa9e2c94df83334b09 Mon Sep 17 00:00:00 2001 From: lifr Date: Tue, 23 Mar 2021 17:53:40 +0800 Subject: [PATCH] Fix cannot success verify count of the networkAgent Config items on R device Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest Fix: 183474500 Change-Id: Ie0fd5ba816c390bfb7bc6512d896a88482c217ec --- .../common/java/android/net/NetworkAgentConfigTest.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt index fd126ad8c0..1e54093bf1 100644 --- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt +++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt @@ -19,6 +19,7 @@ package android.net import android.os.Build import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 +import com.android.modules.utils.build.SdkLevel.isAtLeastS import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.assertParcelSane @@ -44,7 +45,13 @@ class NetworkAgentConfigTest { setPartialConnectivityAcceptable(false) setUnvalidatedConnectivityAcceptable(true) }.build() - assertParcelSane(config, 12) + if (isAtLeastS()) { + // From S, the config will have 12 items + assertParcelSane(config, 12) + } else { + // For R or below, the config will have 10 items + assertParcelSane(config, 10) + } } @Test @IgnoreUpTo(Build.VERSION_CODES.Q)