Merge "Ignore NetworkAgentConfigTest on Q" am: e09d5feef2 am: fba73f0c6d am: d7fedf26d0

Change-Id: I4b668a0213f2d56ac744a4992428061e1e7ffcc9
This commit is contained in:
Automerger Merge Worker
2020-03-09 05:30:45 +00:00

View File

@@ -16,16 +16,23 @@
package android.net package android.net
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.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.assertParcelSane import com.android.testutils.assertParcelSane
import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@SmallTest @SmallTest
class NetworkAgentConfigTest { class NetworkAgentConfigTest {
@Test @Rule @JvmField
val ignoreRule = DevSdkIgnoreRule()
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
fun testParcelNetworkAgentConfig() { fun testParcelNetworkAgentConfig() {
val config = NetworkAgentConfig.Builder().apply { val config = NetworkAgentConfig.Builder().apply {
setExplicitlySelected(true) setExplicitlySelected(true)