diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java index 9b9507b381..e756bd3d6c 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java @@ -49,6 +49,7 @@ import android.net.LinkAddress; import android.net.LinkProperties; import android.net.NetworkCapabilities; import android.net.NetworkRequest; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -62,9 +63,12 @@ import com.android.internal.util.StateMachine; import com.android.net.module.util.SharedLog; import com.android.networkstack.tethering.TestConnectivityManager.NetworkRequestInfo; import com.android.networkstack.tethering.TestConnectivityManager.TestNetworkAgent; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -92,6 +96,8 @@ public class UpstreamNetworkMonitorTest { private static final NetworkCapabilities WIFI_CAPABILITIES = new NetworkCapabilities.Builder() .addTransportType(TRANSPORT_WIFI).addCapability(NET_CAPABILITY_INTERNET).build(); + @Rule public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule(); + @Mock private Context mContext; @Mock private EntitlementManager mEntitleMgr; @Mock private IConnectivityManager mCS; @@ -301,6 +307,7 @@ public class UpstreamNetworkMonitorTest { } @Test + @IgnoreAfter(Build.VERSION_CODES.TIRAMISU) public void testSelectPreferredUpstreamType() throws Exception { final Collection preferredTypes = new ArrayList<>(); preferredTypes.add(TYPE_WIFI); @@ -556,6 +563,7 @@ public class UpstreamNetworkMonitorTest { } @Test + @IgnoreAfter(Build.VERSION_CODES.TIRAMISU) public void testSelectMobileWhenMobileIsNotDefault() { final Collection preferredTypes = new ArrayList<>(); // Mobile has higher pirority than wifi.