Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5395e4 authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge changes from topic "NetworkAgent02" am: 31e7ebdd 

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

Change-Id: If59df525be2483064976d3919cf7033fb94e41e6
parents 8ca2d029 31e7ebdd

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)