commit b1d27c29ff8696b0e46dc200d3d19aea90c5582c
author Frank Li <lifr@google.com> Mon Mar 29 11:43:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 29 11:43:14 2021 +0000
tree 604f0118cfa813addfc06433e2e70c640142cc4d
parent 3ab40b5390ce2f2f4236c853cc8fc8e14326b803
parent 8539ed6fd259a8ec674dd7e086d6406563a9efa9

Merge changes from topic "NetworkAgent02" am: 8539ed6fd2

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

Change-Id: If59df525be2483064976d3919cf7033fb94e41e6

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 fd126ad..1e54093 100644
--- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
@@ -19,6 +19,7 @@
 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 @@
             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)