Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a

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

Change-Id: If099f376bfd5d456e938612005c4008b0beae91a
This commit is contained in:
Frank Li
2021-03-29 12:14:01 +00:00
committed by Automerger Merge Worker
parent 59cd6f3076 bc5395e42a
commit 0616526072
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/common/java/android/net/NetworkAgentConfigTest.kt
View File

@@ -19,6 +19,7 @@ package android.net
import android.os.Build import android.os.Build
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import com.android.modules.utils.build.SdkLevel.isAtLeastS
import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.assertParcelSane import com.android.testutils.assertParcelSane
@@ -44,7 +45,13 @@ class NetworkAgentConfigTest {
setPartialConnectivityAcceptable(false) setPartialConnectivityAcceptable(false)
setUnvalidatedConnectivityAcceptable(true) setUnvalidatedConnectivityAcceptable(true)
}.build() }.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) @Test @IgnoreUpTo(Build.VERSION_CODES.Q)