Merge "Fix cannot success verify count of the networkAgent Config items on R device" into sc-dev (3315bd2c) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -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()
		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)