commit 4685a553c216748adc38ad358b271a599d3101bd
author Lorenzo Colitti <lorenzo@google.com> Sat May 28 00:22:06 2022 +0900
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Jun 01 06:05:05 2022 +0000
tree c141fe9f82b3d7e5b5e88bdd28b16cf8ffd2c9d0
parent ec895ea9fbf1f5766e7f4daea14974cce970080a

Run testExcludedRoutesDisabled only in APKs with target SDK < T.

This test crashes if run from an APK that has target SDK 33 or
above because it tries to disable a compat change that on those
SDK versions is enabled by default.

Run it only in CtsNetTestCasesMaxTargetSdk31 and skip it in our
regular CTS modules.

Bug: 233553525
Test: test-only change
Change-Id: Iaf9c46591c13505c9d2a2a09994b9ee22a22390c
(cherry picked from commit 1c7a20c6c697ed4ad6ff08c9cc45131e90ede514)
Merged-In: Iaf9c46591c13505c9d2a2a09994b9ee22a22390c

tests/common/java/android/net/LinkPropertiesTest.java

diff --git a/tests/common/java/android/net/LinkPropertiesTest.java b/tests/common/java/android/net/LinkPropertiesTest.java
index b66a979..581ee22 100644
--- a/tests/common/java/android/net/LinkPropertiesTest.java
+++ b/tests/common/java/android/net/LinkPropertiesTest.java
@@ -46,6 +46,7 @@
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
+import com.android.testutils.filters.CtsNetTestCasesMaxTargetSdk31;
 
 import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges;
 import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges;
@@ -1307,6 +1308,7 @@
     }
 
     @Test @IgnoreUpTo(SC_V2)
+    @CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden on T or above")
     @DisableCompatChanges({LinkProperties.EXCLUDED_ROUTES})
     public void testExcludedRoutesDisabled() {
         final LinkProperties lp = new LinkProperties();